Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

组态添加全局的概念

Browse Source
This commit is contained in:
hongawen
2025-12-23 08:49:46 +08:00
parent 2957188466
commit bc6f3dca80
7 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsConfigurationParm.java
View File

@@ -28,6 +28,11 @@ public class CsConfigurationParm {
private String remark;
/**
* 数据范围 0 私有 1全局
*/
private int scope;
private List<String> projectIds;
@@ -55,6 +60,8 @@ public class CsConfigurationParm {
@EqualsAndHashCode(callSuper = true)
public static class CsConfigurationQueryParam extends BaseParam {
private String id;
@ApiModelProperty(value = "当前用户ID")
private String currentUserId;
}

9
cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsConfigurationPO.java
View File

@@ -17,7 +17,7 @@ import lombok.NoArgsConstructor;
*/
@Data
@NoArgsConstructor
@TableName(value = "cs_configuration")
@TableName(value = "cs_configuration")
public class CsConfigurationPO extends BaseEntity {
/**
* id
@@ -31,6 +31,12 @@ public class CsConfigurationPO extends BaseEntity {
@TableField(value = "`name`")
private String name;
/**
* 数据范围 0 私有 1全局
*/
@TableField(value = "scope")
private int scope;
@TableField(value = "image_path")
private String imagePath;
@@ -50,7 +56,6 @@ public class CsConfigurationPO extends BaseEntity {
private String status;
public static final String COL_ID = "id";
public static final String COL_NAME = "name";

25
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsConfigurationController.java
View File

@@ -22,10 +22,10 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
/**
* (cs_configuration)表控制层
*
* @author xxxxx
*/
* (cs_configuration)表控制层
*
* @author xxxxx
*/
@Slf4j
@RestController
@RequestMapping("/csconfiguration")
@@ -38,10 +38,10 @@ public class CsConfigurationController extends BaseController {
@PostMapping("/add")
@ApiOperation("新增组态项目")
@ApiImplicitParam(name = "csConfigurationParm", value = "新增组态项目参数", required = true)
public HttpResult<Boolean> add(@RequestBody @Validated CsConfigurationParm csConfigurationParm){
public HttpResult<Boolean> add(@RequestBody @Validated CsConfigurationParm csConfigurationParm) {
String methodDescribe = getMethodDescribe("add");
boolean save = csConfigurationService.add (csConfigurationParm);
boolean save = csConfigurationService.add(csConfigurationParm);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, save, methodDescribe);
}
@@ -49,23 +49,22 @@ public class CsConfigurationController extends BaseController {
@PostMapping("/audit")
@ApiOperation("修改组态项目")
@ApiImplicitParam(name = "auditParm", value = "修改组态项目参数", required = true)
public HttpResult<Boolean> audit(@RequestBody @Validated CsConfigurationParm.CsConfigurationAuditParam auditParm){
public HttpResult<Boolean> audit(@RequestBody @Validated CsConfigurationParm.CsConfigurationAuditParam auditParm) {
String methodDescribe = getMethodDescribe("audit");
boolean save = csConfigurationService.audit (auditParm);
boolean save = csConfigurationService.audit(auditParm);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, save, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/queryPage")
@ApiOperation("组态项目分页查询")
@ApiImplicitParam(name = "csConfigurationQueryParam", value = "组态项目查询参数", required = true)
public HttpResult<IPage<CsConfigurationVO>> queryPage(@RequestBody @Validated CsConfigurationParm.CsConfigurationQueryParam csConfigurationQueryParam ){
public HttpResult<IPage<CsConfigurationVO>> queryPage(@RequestBody @Validated CsConfigurationParm.CsConfigurationQueryParam csConfigurationQueryParam) {
String methodDescribe = getMethodDescribe("queryPage");
IPage<CsConfigurationVO> page = csConfigurationService.queryPage (csConfigurationQueryParam);
IPage<CsConfigurationVO> page = csConfigurationService.queryPage(csConfigurationQueryParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
}
@@ -73,10 +72,10 @@ public class CsConfigurationController extends BaseController {
@PostMapping("/uploadImage")
@ApiOperation("上传底图")
@ApiImplicitParam(name = "file", value = "底图文件", required = true)
public HttpResult<MinIoUploadResDTO> uploadImage(@RequestParam("file") MultipartFile issuesFile){
public HttpResult<MinIoUploadResDTO> uploadImage(@RequestParam("file") MultipartFile issuesFile) {
String methodDescribe = getMethodDescribe("uploadImage");
String filePath = csConfigurationService.uploadImage(issuesFile);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,new MinIoUploadResDTO(issuesFile.getOriginalFilename(),filePath), methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, new MinIoUploadResDTO(issuesFile.getOriginalFilename(), filePath), methodDescribe);
}
}

2
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsConfigurationMapper.java
View File

@@ -16,5 +16,5 @@ import java.util.List;
* @version V1.0.0
*/
public interface CsConfigurationMapper extends BaseMapper<CsConfigurationPO> {
Page<CsConfigurationPO> queryPage(Page<CsConfigurationPO> temppage, @Param("temp") CsConfigurationParm.CsConfigurationQueryParam csConfigurationQueryParam, @Param("list") List<String> list);
Page<CsConfigurationPO> queryPage(Page<CsConfigurationPO> temppage, @Param("temp") CsConfigurationParm.CsConfigurationQueryParam csConfigurationQueryParam, @Param("list") List<String> list, @Param("userId") String userId);
}

1
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsConfigurationMapper.xml
View File

@@ -24,6 +24,7 @@
<foreach collection="list" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
AND (a.scope = 1 OR (a.scope = 0 AND a.create_by = #{userId}))
<if test="temp!=null and temp.searchValue != null and temp.searchValue !=''">
AND a.name like concat(concat("%",#{temp.searchValue}),"%")
</if>

5
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsConfigurationServiceImpl.java
View File

@@ -124,7 +124,10 @@ public class CsConfigurationServiceImpl extends ServiceImpl<CsConfigurationMappe
}
//+无线项目id
data1.add(DataParam.WIRELESS_PROJECT_ID);
Page<CsConfigurationPO> csConfigurationPOPage = this.getBaseMapper().queryPage(temppage,csConfigurationQueryParam,data1);
Page<CsConfigurationPO> csConfigurationPOPage = this.getBaseMapper().queryPage(temppage,csConfigurationQueryParam,data1,csConfigurationQueryParam.getCurrentUserId());
// QueryWrapper<CsConfigurationPO> query = new QueryWrapper<>();
// query.like(StringUtils.isNotBlank(csConfigurationQueryParam.getSearchValue()),CsConfigurationPO.COL_NAME,csConfigurationQueryParam.getSearchValue()).
// le (StringUtils.isNotBlank (csConfigurationQueryParam.getSearchEndTime()), CsConfigurationPO.COL_CREATE_TIME, csConfigurationQueryParam.getSearchEndTime ( )).

1
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/LineTargetServiceImpl.java
View File

@@ -146,6 +146,7 @@ public class LineTargetServiceImpl implements ILineTargetService {
String path = csPagePOService.queryById(id).getPath();
InputStream inputStream = fileStorageUtil.getFileStream(path);
ZuTaiDTO zuTaiDto = analysisJson(inputStream);
zuTaiDto.getJson().forEach(item->{
if (ObjectUtil.isNotNull(item.getUIdType()) && item.getUIdType()) {
Object lastElement = item.getUId().get(item.getUId().size() - 1);