bug

slope-common/slope-common-core/src/main/java/com/sckw/core/model/enums/MessageLogEnum.java

@@ -177,6 +177,12 @@ public enum MessageLogEnum {
     REFERENCE_ADD("slope_manage", "PROJECT_LOG", "设置基准", "30",
             "设备【${name}】已设置了监测基准值,所属边坡【${projectName}】,【${desc}】", "设置基准"),
 
+    COMPANY_ADD("slope_manage", "PROJECT_LOG", "新增矿山", "31",
+            "新增矿山【${name}】，矿山类型：【${type}】", "新增矿山"),
+
+    COMPANY_UPDATE("slope_manage", "PROJECT_LOG", "修改矿山", "32",
+            "修改矿山【${name}】，矿山类型：【${type}】", "修改矿山"),
+
     ;
 
 

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/service/CompanyService.java

@@ -8,6 +8,7 @@ import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.constant.NumberConstant;
 import com.sckw.core.model.enums.CompanyTypeEnum;
 import com.sckw.core.model.enums.CompanyStatusEnum;
+import com.sckw.core.model.enums.MessageLogEnum;
 import com.sckw.core.model.page.PageRes;
 
 import com.sckw.core.utils.IdWorker;
@@ -54,8 +55,8 @@ public class CompanyService {
         HeaderData headerData = commonService.getHeaderData(request);
         PageHelper.startPage(query.getPage(), query.getPageSize());
         List<KwsCompany> company = companyMapper.selectList(new LambdaQueryWrapper<KwsCompany>()
-                .eq(KwsCompany::getCompanyId, headerData.getCompanyId())
-                .eq(KwsCompany::getCompanyId, NumberConstant.ZERO)
+                .eq(StringUtils.isNotBlank(headerData.getCompanyId()), KwsCompany::getCompanyId, headerData.getCompanyId())
+                .eq(KwsCompany::getDelFlag, NumberConstant.ZERO)
                 .like(StringUtils.isNotBlank(query.getName()), KwsCompany::getName, query.getName())
                         .orderByDesc(KwsCompany::getCreateTime)
         );
@@ -103,6 +104,11 @@ public class CompanyService {
         company.setUpdateBy(Long.parseLong(headerData.getUpdateBy()));
         company.setUpdateTime(now);
         companyMapper.insert(company);
+
+        Map<String, Object> logMap = new HashMap<>(NumberConstant.SIXTEEN);
+        logMap.put("name", add.getName());
+        logMap.put("type", CompanyTypeEnum.getName(add.getType()));
+        commonService.insertLog(MessageLogEnum.COMPANY_ADD, headerData, logMap, Long.parseLong(headerData.getUpdateBy()));
         return HttpResult.ok();
     }
 
@@ -139,6 +145,10 @@ public class CompanyService {
         company.setUpdateBy(Long.parseLong(headerData.getUpdateBy()));
         company.setUpdateTime(now);
         Integer updateStatus = companyMapper.updateById(company);
+        Map<String, Object> logMap = new HashMap<>(NumberConstant.SIXTEEN);
+        logMap.put("name", add.getName());
+        logMap.put("type", CompanyTypeEnum.getName(add.getType()));
+        commonService.insertLog(MessageLogEnum.COMPANY_UPDATE, headerData, logMap, Long.parseLong(headerData.getUpdateBy()));
         return HttpResult.ok();
     }
 

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/service/LogService.java

@@ -59,7 +59,7 @@ public class LogService {
         HeaderData headerData = commonService.getHeaderData(request);
         List<KwsLog> kwsLogs = logMapper.selectList(new LambdaQueryWrapper<KwsLog>()
                 .eq(StringUtils.isNotBlank(query.getType()), KwsLog::getType, query.getType())
-                .eq(KwsLog::getCompanyId, headerData.getCompanyId())
+                .eq(StringUtils.isNotBlank(headerData.getCompanyId()), KwsLog::getCompanyId, headerData.getCompanyId())
                 .like(StringUtils.isNotBlank(query.getContent()), KwsLog::getContent, query.getContent())
                 .orderByDesc(KwsLog::getCreateTime)
         );

slope-modules/slope-detection/src/main/resources/bootstrap.yml

@@ -6,7 +6,7 @@ spring:
     name: slope-detection
 #    name: slope-detection
   profiles:
-    active: lfdc
+    active: sky
     #active: ${DEPLOY_MODE:dev}
   main:
     allow-bean-definition-overriding: true

slope-modules/slope-detection/src/main/resources/mapper/mysql/KwsDeviceMapper.xml

@@ -409,10 +409,13 @@
                LEFT JOIN kws_device_model c ON b.model_id = c.id
       WHERE b.del_flag = 0
         and c.del_flag = 0
-      and b.mountain_id = #{companyId}
       <if test="modelType != null and modelType != ''">
           and c.device_type = #{modelType}
       </if>
+
+      <if test="companyId != null and companyId != ''">
+          and b.mountain_id = #{companyId}
+      </if>
   </select>
 
   <select id="getDataByDeviceIdAndProjectId" resultType="com.sckw.slope.detection.model.vo.excel.KwsAlarmExportVO">