组态添加全局的概念

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

@@ -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;
 
     }
 

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

@@ -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";

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

@@ -57,7 +57,6 @@ public class CsConfigurationController extends BaseController {
     }
 
 
-
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/queryPage")
     @ApiOperation("组态项目分页查询")

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

@@ -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);
 }

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

@@ -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>

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

@@ -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 ( )).

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

@@ -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);