监测点阈值调整

application/src/main/java/org/thingsboard/server/controller/nanxi/NxMonitorSiteConfigController.java

@@ -6,6 +6,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.domain.BaseOutput;
 import org.thingsboard.server.domain.NxMonitorSiteConfig;
 import org.thingsboard.server.domain.NxMonitorSiteConfigDto;
+import org.thingsboard.server.domain.vo.NxMonitorSiteConfigVo;
 import org.thingsboard.server.service.nanxi.INxMonitorSiteConfigService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -36,8 +37,8 @@ public class NxMonitorSiteConfigController {
      */
     @ApiOperation(value = "通过监测点id查询", notes = "通过监测点id查询")
     @GetMapping("/{id}")
-    public BaseOutput<NxMonitorSiteConfig> getById(@PathVariable Integer id) {
-        return BaseOutput.success(nxMonitorSiteConfigService.getById(id));
+    public BaseOutput<NxMonitorSiteConfigVo> getById(@PathVariable Long id) {
+        return BaseOutput.success(nxMonitorSiteConfigService.getSiteConfigById(id));
     }
 
     /**
@@ -54,13 +55,13 @@ public class NxMonitorSiteConfigController {
 
     /**
      * 修改
-     * @param nxMonitorSiteConfig
+     * @param nxMonitorSiteConfigDto
      * @return Result
      */
     @ApiOperation(value = "修改", notes = "修改")
     @PutMapping
-    public BaseOutput updateById(@RequestBody NxMonitorSiteConfig nxMonitorSiteConfig) {
-        return nxMonitorSiteConfigService.updateById(nxMonitorSiteConfig) ? BaseOutput.successMsg("修改成功") : BaseOutput.failure("修改失败");
+    public BaseOutput updateById(@RequestBody NxMonitorSiteConfigDto nxMonitorSiteConfigDto) {
+        return nxMonitorSiteConfigService.saveConfig(nxMonitorSiteConfigDto,false) ? BaseOutput.successMsg("修改成功") : BaseOutput.failure("修改失败");
 
     }
 

application/src/main/java/org/thingsboard/server/domain/NxMonitorSite.java

@@ -98,7 +98,7 @@ public class NxMonitorSite extends BaseEntity {
 
     @ApiModelProperty(value = "关联指标列表")
     @TableField(exist = false)
-    private List<NxMonitorSiteDparam>  siteDparmList;
+    private List<NxMonitorSiteDparam> siteDparmList;
 
     /**
      * 站点编码
@@ -109,4 +109,10 @@ public class NxMonitorSite extends BaseEntity {
     @ApiModelProperty(value = "关联设备列表")
     @TableField(exist = false)
     private List<NxDeviceW> siteDeviceList;
+
+    @ApiModelProperty(value = "是否同步监测体系 0-否 1-是")
+    private String isSyn;
+
+    @ApiModelProperty(value = "关联监测体系id")
+    private Long setupId;
 }

application/src/main/java/org/thingsboard/server/domain/vo/NxMonitorSiteConfigVo.java

@@ -15,14 +15,14 @@ public class NxMonitorSiteConfigVo {
     @ApiModelProperty("监测点ID")
     private Long  siteId;
 
-    @ApiModelProperty("是否同步监测体系")
+    @ApiModelProperty("是否同步监测体系 0-否 1-是")
     private String  isSyn;
 
     @ApiModelProperty("监测体系ID")
     private Long  setupId;
 
     @ApiModelProperty("监测体系名称")
-    private Long  setupName;
+    private String  setupName;
 
 
     @ApiModelProperty("监测指标")

application/src/main/java/org/thingsboard/server/mapper/NxMonitorSiteConfigMapper.java

@@ -1,9 +1,12 @@
 package org.thingsboard.server.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.thingsboard.server.domain.NxMonitorSiteConfig;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * @author Mu
  * @date 2023-05-18
@@ -13,4 +16,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface NxMonitorSiteConfigMapper extends BaseMapper<NxMonitorSiteConfig> {
 
+    List<NxMonitorSiteConfig> getConfigList( @Param("id") Long id);
 }

application/src/main/java/org/thingsboard/server/service/nanxi/INxMonitorSiteConfigService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.domain.NxMonitorSiteConfig;
 import org.thingsboard.server.domain.NxMonitorSiteConfigDto;
+import org.thingsboard.server.domain.vo.NxMonitorSiteConfigVo;
 
 /**
  * @author Mu
@@ -22,4 +23,6 @@ public interface INxMonitorSiteConfigService extends IService<NxMonitorSiteConfi
     TkPageData<NxMonitorSiteConfig> page(NxMonitorSiteConfig nxMonitorSiteConfig);
 
     boolean saveConfig(NxMonitorSiteConfigDto nxMonitorSiteConfigDto, boolean isAdd);
+
+    NxMonitorSiteConfigVo getSiteConfigById(Long id);
 }

application/src/main/java/org/thingsboard/server/service/nanxi/impl/NxMonitorSiteConfigServiceImpl.java

@@ -2,49 +2,83 @@ package org.thingsboard.server.service.nanxi.impl;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.thingsboard.server.domain.NxMonitorSiteConfig;
-import org.thingsboard.server.domain.NxMonitorSiteConfigDto;
+import org.thingsboard.server.domain.*;
+import org.thingsboard.server.domain.vo.NxMonitorSiteConfigVo;
+import org.thingsboard.server.mapper.NxMonitorSetupMapper;
 import org.thingsboard.server.mapper.NxMonitorSiteConfigMapper;
+import org.thingsboard.server.mapper.NxMonitorSiteMapper;
 import org.thingsboard.server.service.nanxi.INxMonitorSiteConfigService;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
+
 import static org.thingsboard.server.utils.PageConvert.getPageData;
+
 /**
  * @author Mu
  * @date 2023-05-18
- *
  * @description
  */
 @Service
 public class NxMonitorSiteConfigServiceImpl extends ServiceImpl<NxMonitorSiteConfigMapper, NxMonitorSiteConfig> implements INxMonitorSiteConfigService {
 
 
-        @Autowired
-        private NxMonitorSiteConfigMapper nxMonitorSiteConfigMapper;
+    @Autowired
+    private NxMonitorSiteConfigMapper nxMonitorSiteConfigMapper;
+    @Autowired
+    private NxMonitorSiteMapper nxMonitorSiteMapper;
 
-        @Override
-        public TkPageData<NxMonitorSiteConfig> page(NxMonitorSiteConfig nxMonitorSiteConfig) {
-            // 创建分页对象，设置当前页和每页记录数
-            Page<NxMonitorSiteConfig> page = new Page<>(nxMonitorSiteConfig.getPage(), nxMonitorSiteConfig.getPageSize());
+    private NxMonitorSetupMapper nxMonitorSetupMapper;
 
-            // 构造查询条件
-            Wrapper<NxMonitorSiteConfig> wrapper = new QueryWrapper<NxMonitorSiteConfig>();
+    @Override
+    public TkPageData<NxMonitorSiteConfig> page(NxMonitorSiteConfig nxMonitorSiteConfig) {
+        // 创建分页对象，设置当前页和每页记录数
+        Page<NxMonitorSiteConfig> page = new Page<>(nxMonitorSiteConfig.getPage(), nxMonitorSiteConfig.getPageSize());
 
-            // 执行分页查询
-            return getPageData(nxMonitorSiteConfigMapper.selectPage(page, wrapper),NxMonitorSiteConfig.class);
-        }
+        // 构造查询条件
+        Wrapper<NxMonitorSiteConfig> wrapper = new QueryWrapper<NxMonitorSiteConfig>();
+
+        // 执行分页查询
+        return getPageData(nxMonitorSiteConfigMapper.selectPage(page, wrapper), NxMonitorSiteConfig.class);
+    }
 
     @Override
     public boolean saveConfig(NxMonitorSiteConfigDto nxMonitorSiteConfigDto, boolean isAdd) {
-        boolean flag=false;
-        if(isAdd){
+        boolean flag = false;
+        NxMonitorSite nxMonitorSite = nxMonitorSiteMapper.selectById(nxMonitorSiteConfigDto.getSiteId());
 
+        nxMonitorSite.setIsSyn(nxMonitorSiteConfigDto.getIsSyn());
+        nxMonitorSite.setSetupId(nxMonitorSiteConfigDto.getSetupId());
+        if (nxMonitorSiteMapper.updateById(nxMonitorSite) > 0) {
+            flag = true;
+        }
+        if (!isAdd) {
+            nxMonitorSiteConfigMapper.delete(Wrappers.<NxMonitorSiteConfig>lambdaQuery().eq(NxMonitorSiteConfig::getSiteId, nxMonitorSiteConfigDto.getSiteId()));
+        }
+        for (NxMonitorSiteConfig detail : nxMonitorSiteConfigDto.getConfigList()) {
+            detail.setSiteId(nxMonitorSiteConfigDto.getSiteId());
+            nxMonitorSiteConfigMapper.insert(detail);
         }
-        return  flag;
+        return flag;
+    }
+
+    @Override
+    public NxMonitorSiteConfigVo getSiteConfigById(Long id) {
+        NxMonitorSiteConfigVo nxMonitorSiteConfigVo=new NxMonitorSiteConfigVo();
+        NxMonitorSite nxMonitorSite = nxMonitorSiteMapper.selectById(id);
+        nxMonitorSiteConfigVo.setIsSyn(nxMonitorSite.getIsSyn());
+        NxMonitorSetup nxMonitorSetup=nxMonitorSetupMapper.selectById(nxMonitorSite.getSetupId());
+        nxMonitorSiteConfigVo.setSetupId(nxMonitorSite.getSetupId());
+        nxMonitorSiteConfigVo.setSetupName(nxMonitorSetup.getSetupName());
+        List<NxMonitorSiteConfig> details=nxMonitorSiteConfigMapper.getConfigList(id);
+        nxMonitorSiteConfigVo.setConfigList(details);
+        return nxMonitorSiteConfigVo;
     }
 }
 

application/src/main/resources/mapper/NxDeviceTypeMapper.xml

@@ -32,15 +32,10 @@
             type_group
     </sql>
     <select id="selectDeviceTypePage" resultMap="nxDeviceTypeMap">
-        select
-        <include refid="Base_Column_List"/>
+        select *
         from nx_device_type
-        where 1=1
-        <if test="likeStr!=null and likeStr!=''">
-           and type_name like '%'||#{likeStr}||'%'
-           or census_unit like '%'||#{likeStr}||'%'
-           or type_group like '%'||#{likeStr}||'%'
-        </if>
+        where 1 = 1
+
     </select>
 
     <select id="getRealName" resultType="string">

application/src/main/resources/mapper/NxMonitorSiteConfigMapper.xml

@@ -52,6 +52,10 @@
             update_time,
             is_deleted
     </sql>
+    <select id="getConfigList" resultMap="nxMonitorSiteConfigMap">
+        select <include refid="Base_Column_List"/>
+            from nx_monitor_site_config where site_id=#{id}
+    </select>
 
 </mapper>