模板适配调整

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/line/CslineController.java

@@ -121,4 +121,15 @@ public class CslineController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/updateIds")
+    @ApiOperation("修改监测点模板id和数据集id")
+    @ApiImplicitParam(name = "csLineParam", value = "监测点信息", required = true)
+    @ApiIgnore
+    public HttpResult<Boolean> updateIds(@RequestBody @Validated CsLineParam csLineParam) {
+        String methodDescribe = getMethodDescribe("updateIds");
+        csLinePOService.updateIds(csLineParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
 }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDataArrayMapper.xml

@@ -105,6 +105,7 @@
             t0.ndid = #{param.id}
             and t1.did = #{param.did}
             and t3.cl_dev = #{param.cldId}
+            and (t3.data_type = 'Stat' or t3.data_type is NULL)
             and t4.stat_method = #{param.statMethod}
         order by t4.sort
     </select>

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsLinePOService.java

@@ -40,4 +40,10 @@ public interface CsLinePOService extends IService<CsLinePO>{
      */
     void updateLine(CsLineParam csLineParam);
 
+    /**
+     * 修改监测点的数据集id和模板id
+     * @param csLineParam
+     */
+    void updateIds(CsLineParam csLineParam);
+
 }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java

@@ -71,6 +71,16 @@ public class CsLinePOServiceImpl extends ServiceImpl<CsLinePOMapper, CsLinePO> i
         this.update(lambdaUpdateWrapper);
     }
 
+    @Override
+    public void updateIds(CsLineParam csLineParam) {
+        LambdaUpdateWrapper<CsLinePO> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+        lambdaUpdateWrapper.eq(CsLinePO::getLineId,csLineParam.getLineId())
+                .eq(CsLinePO::getStatus,1)
+                .set(CsLinePO::getDataSetId,csLineParam.getDataSetId())
+                .set(CsLinePO::getDataModelId,csLineParam.getModelId());
+        this.update(lambdaUpdateWrapper);
+    }
+
 //    /**
 //     * 1.平台端默认配置拓扑图模板，包含拓扑图信息(cs_topology_diagram_template)和拓扑图上监测点的点位信息(cs_line_topology_template)
 //     *