bug修复

src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorDevController.java

@@ -39,6 +39,7 @@ public class ConcreteMonitorDevController {
 
     /**
      * 分页列表查询
+     *
      * @return
      */
     @ApiOperation(value = " 分页列表查询混凝土监测设备信息", notes = "分页列表查询混凝土监测设备信息", httpMethod = "POST")
@@ -60,8 +61,10 @@ public class ConcreteMonitorDevController {
     public Result<List<ConcreteMonitorDev>> selectConcreteMonitorDevList(@RequestBody Map<String, Object> map) {
         return Result.success(concreteMonitorDevService.selectConcreteMonitorDevList(map));
     }
+
     /**
      * 添加
+     *
      * @param concreteMonitorDev
      * @return
      */
@@ -70,19 +73,14 @@ public class ConcreteMonitorDevController {
     @PostMapping(value = "/add")
     public Result<ConcreteMonitorDev> add(@RequestBody ConcreteMonitorDev concreteMonitorDev) {
         Result<ConcreteMonitorDev> result = new Result<ConcreteMonitorDev>();
-		try {
         concreteMonitorDevService.saveConcreteMonitorDev(concreteMonitorDev);
         result.successMsg("添加成功！");
-		} catch (Exception e) {
-			e.printStackTrace();
-			log.info(e.getMessage());
-			result.error500("操作失败");
-		}
         return result;
     }
 
     /**
      * 编辑
+     *
      * @param concreteMonitorDev
      * @return
      */
@@ -96,6 +94,7 @@ public class ConcreteMonitorDevController {
 
     /**
      * 通过id删除
+     *
      * @param
      * @return
      */
@@ -109,9 +108,9 @@ public class ConcreteMonitorDevController {
     }
 
 
-	
     /**
      * 通过id查询
+     *
      * @param
      * @return
      */
@@ -123,5 +122,4 @@ public class ConcreteMonitorDevController {
     }
 
 
-
 }

src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectController.java

@@ -189,11 +189,12 @@ public class ProjectController {
     @PostMapping(value = "/edit")
     public Result<Project> edit(@RequestBody Project project) {
         Result<Project> result = new Result<Project>();
-        Project projectEntity = projectService.getById(project.getProjectId());
+        LambdaQueryWrapper<Project> queryWrapper = new LambdaQueryWrapper<Project>().eq(Project::getProjectSn, project.getProjectSn());
+        Project projectEntity = projectService.getOne(queryWrapper);
         if (projectEntity == null) {
             result.error500(MessageUtil.get("notFindErr"));
         } else {
-            boolean ok = projectService.updateById(project);
+            boolean ok = projectService.update(project, queryWrapper);
             redisRepository.del("projectInfoBySn:" + project.getProjectSn());
             if (ok) {
                 result.successMsg(MessageUtil.get("editSucess"));

src/main/java/com/zhgd/xmgl/modules/quality/mapper/DangerTypeRecordMapper.java

@@ -25,7 +25,7 @@ public interface DangerTypeRecordMapper extends BaseMapper<DangerTypeRecord> {
 
     List<EntityMap> selectCompanyChildDangerTypeList(Map<String, Object> map);
 
-    List<EntityMap> getBigList(String projectSn);
+    List<EntityMap> getBigList(Map<String, Object> map);
 
     int deleteRecordById(Long id);
 }

src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/ISjImageProgressService.xml

@@ -48,6 +48,9 @@
         and type = 1) b ON b.danger_type_id = a.id
         WHERE a.parent_id != 0
         and p2.project_sn = #{projectSn}
+        <if test="recordStatus == '0'.toString()">
+            and b.record_status IS null
+        </if>
         ORDER BY a.parent_id, a.order_sort
     </select>
 
@@ -99,6 +102,9 @@
         and type = 1) b ON b.danger_type_id = a.id
         WHERE a.parent_id = 0
         and p2.project_sn = #{projectSn}
+        <if test="recordStatus == '0'.toString()">
+            and b.record_status IS null
+        </if>
         ORDER BY a.parent_id, a.order_sort
     </select>
 </mapper>

src/main/java/com/zhgd/xmgl/modules/quality/service/impl/DangerTypeRecordServiceImpl.java

@@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.quality.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.base.Objects;
 import com.zhgd.jeecg.common.mybatis.EntityMap;
 import com.zhgd.xmgl.modules.project.entity.ProjectDangerTypeDisable;
 import com.zhgd.xmgl.modules.project.mapper.ProjectDangerTypeDisableMapper;
@@ -18,6 +19,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -152,7 +154,7 @@ public class DangerTypeRecordServiceImpl extends ServiceImpl<DangerTypeRecordMap
     @Override
     public List<EntityMap> selectDangerTypeList(Map<String, Object> map) {
         String dangerName = MapUtils.getString(map, "dangerName");
-        List<EntityMap> list = dangerTypeRecordMapper.getBigList(MapUtils.getString(map, "projectSn"));
+        List<EntityMap> list = dangerTypeRecordMapper.getBigList(map);
         List<EntityMap> childList = dangerTypeRecordMapper.selectChildDangerTypeList(map);
         list = getchildrenList(list, childList, dangerName);
         return list;
@@ -161,7 +163,12 @@ public class DangerTypeRecordServiceImpl extends ServiceImpl<DangerTypeRecordMap
     @Override
     public List<EntityMap> selectDangerTypeAndItemList(Map<String, Object> map) {
         String dangerName = MapUtils.getString(map, "dangerName");
-        List<EntityMap> list = dangerTypeRecordMapper.getBigList(MapUtils.getString(map, "projectSn"));
+        //Integer recordStatus = MapUtils.getInteger(map, "recordStatus");
+        //只显示开启的状态的
+        //if (Objects.equal(recordStatus, 0)) {
+        //    map.put("open", 1);
+        //}
+        List<EntityMap> list = dangerTypeRecordMapper.getBigList(map);
         List<EntityMap> childList = dangerTypeRecordMapper.selectChildDangerTypeList(map);
         String headquartersSn = projectMapper.getHeadquartersSnByProject(MapUtils.getString(map, "projectSn"));
         map.put("headquartersSn", headquartersSn);
@@ -185,7 +192,9 @@ public class DangerTypeRecordServiceImpl extends ServiceImpl<DangerTypeRecordMap
 
     @Override
     public List<EntityMap> getBigList(String projectSn) {
-        return dangerTypeRecordMapper.getBigList(projectSn);
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("projectSn", projectSn);
+        return dangerTypeRecordMapper.getBigList(map);
     }
 
     @Override

src/main/resources/application-other-env-show.properties

@@ -24,7 +24,7 @@ video.alarm.newUrl=223.82.100.80:6040
 wx-appid=
 wx-AppSecret=
 mqtt-scope=zjsjTopic
-serverUrl=http://124.71.67.160:8088/
+serverUrl=http://127.0.0.1:11120
 #serverUrl=http://182.90.224.237:7000
 #serverUrl=http://127.0.0.1:6023
 #\u89C6\u9891\u5206\u6790url