应急

src/main/java/com/sooka/sponest/data/emergency/appmin/patrolstation/domain/AppPatrolstationVO.java

@@ -1,10 +1,11 @@
 package com.sooka.sponest.data.emergency.appmin.patrolstation.domain;
 
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
 import lombok.Data;
 
 @Data
-public class AppPatrolstationVO extends BaseEntity {
+public class AppPatrolstationVO extends BaseBusinessEntity {
 
     String searchValue;
 

src/main/java/com/sooka/sponest/data/emergency/appmin/patrolstation/service/impl/AppPatrolstationServiceImpl.java

@@ -3,6 +3,7 @@ package com.sooka.sponest.data.emergency.appmin.patrolstation.service.impl;
 import com.ruoyi.common.core.utils.uuid.UUID;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.datascope.annotation.DataScope;
+import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.emergency.appmin.base.AppBaseService;
 import com.sooka.sponest.data.emergency.appmin.patrolstation.domain.AppPatrolstationVO;
 import com.sooka.sponest.data.emergency.appmin.patrolstation.service.AppPatrolstationService;
@@ -16,7 +17,7 @@ import javax.annotation.Resource;
 import java.util.List;
 
 @Service
-public class AppPatrolstationServiceImpl extends AppBaseService implements AppPatrolstationService {
+public class AppPatrolstationServiceImpl extends BaseServiceImpl implements AppPatrolstationService {
 
     @Resource
     TBusPatrolstationMapper tBusPatrolstationMapper;
@@ -26,6 +27,7 @@ public class AppPatrolstationServiceImpl extends AppBaseService implements AppPa
 
     @Override
     public AjaxResult addPatrolstation(AppPatrolstationVO vo) {
+        setSookaDataBase(vo);
         try {
             TBusPatrolstation t = new TBusPatrolstation();
             t.setBusPatrolstationCode(vo.getBusPatrolstationCode());
@@ -43,7 +45,7 @@ public class AppPatrolstationServiceImpl extends AppBaseService implements AppPa
             tBusPatrolstation.setLongitude(vo.getLongitude());
             tBusPatrolstation.setRemarks(vo.getRemarks());
 
-            TBusEnterprise  enterprise = tBusEnterpriseMapper.selectTBusEnterpriseByBusEnterpriseId(vo.getBusEnterpriseId());
+            TBusEnterprise  enterprise = tBusEnterpriseMapper.selectTBusEnterpriseByBusEnterpriseId(vo);
             tBusPatrolstation.setBusEnterpriseName(enterprise.getBusinessName());
 
             tBusPatrolstationMapper.insertTBusPatrolstation(tBusPatrolstation);
@@ -72,6 +74,7 @@ public class AppPatrolstationServiceImpl extends AppBaseService implements AppPa
 
     @Override
     public AjaxResult edittPatrolstationList(AppPatrolstationVO vo) {
+        setSookaDataBase(vo);
         try {
             TBusPatrolstation tBusPatrolstation = new TBusPatrolstation();
             tBusPatrolstation.setBusPatrolstationId(vo.getBusPatrolstationId());
@@ -81,7 +84,7 @@ public class AppPatrolstationServiceImpl extends AppBaseService implements AppPa
             tBusPatrolstation.setLatitude(vo.getLatitude());
             tBusPatrolstation.setBusPatrolstationCode(vo.getBusPatrolstationCode());
             if(vo.getBusEnterpriseId() != null){
-                TBusEnterprise enterprise = tBusEnterpriseMapper.selectTBusEnterpriseByBusEnterpriseId(vo.getBusEnterpriseId());
+                TBusEnterprise enterprise = tBusEnterpriseMapper.selectTBusEnterpriseByBusEnterpriseId(vo);
                 tBusPatrolstation.setBusEnterpriseName(enterprise.getBusinessName());
             }
             tBusPatrolstation.setBusEnterpriseId(vo.getBusEnterpriseId());

src/main/java/com/sooka/sponest/data/emergency/appmin/xungeng/service/impl/AppXungengServiceImpl.java

@@ -4,6 +4,7 @@ import com.ruoyi.common.core.utils.uuid.UUID;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.model.LoginUser;
+import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.emergency.appmin.base.AppBaseService;
 import com.sooka.sponest.data.emergency.appmin.xungeng.domain.AppXungengVO;
 import com.sooka.sponest.data.emergency.appmin.xungeng.service.AppXungengService;
@@ -19,7 +20,7 @@ import java.util.Date;
 import java.util.List;
 
 @Service
-public class AppXungengServiceImpl extends AppBaseService implements AppXungengService {
+public class AppXungengServiceImpl extends BaseServiceImpl implements AppXungengService {
 
     @Resource
     TBusLogMapper logMapper;
@@ -53,7 +54,8 @@ public class AppXungengServiceImpl extends AppBaseService implements AppXungengS
             tBusLog.setBusPatrolstationName(tBusPatrolstation.getBusPatrolstationName());
             tBusLog.setBusEnterpriseId(tBusPatrolstation.getBusEnterpriseId());
 
-            tBusLog.setBusEnterpriseName(tBusEnterpriseMapper.selectTBusEnterpriseByBusEnterpriseId(tBusPatrolstation.getBusEnterpriseId()).getBusinessName());
+            setSookaDataBase(tBusPatrolstation);
+            tBusLog.setBusEnterpriseName(tBusEnterpriseMapper.selectTBusEnterpriseByBusEnterpriseId(tBusPatrolstation).getBusinessName());
             tBusLog.setBusPatrolstationName(tBusPatrolstation.getBusEnterpriseName());
             tBusLog.setCreateTime(new Date());
             logMapper.insertTBusLog(tBusLog);

src/main/java/com/sooka/sponest/data/emergency/appmin/xunjian/controller/AppXunjianController.java

@@ -89,7 +89,7 @@ public class AppXunjianController {
         return appXunjianService.getFCTZSdetail(vo);
     }
 
-    @RequestMapping("changeInspection")
+    @PostMapping("changeInspection")
     public AjaxResult changeInspection(@RequestBody AppXunjianInspectionVO vo) {
         return appXunjianService.changeInspection(vo);
     }

src/main/java/com/sooka/sponest/data/emergency/appmin/xunjian/domain/AppXunjianVO.java

@@ -1,6 +1,7 @@
 package com.sooka.sponest.data.emergency.appmin.xunjian.domain;
 
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -8,7 +9,7 @@ import java.util.Map;
 
 @Getter
 @Setter
-public class AppXunjianVO extends BaseEntity {
+public class AppXunjianVO extends BaseBusinessEntity {
 
     String busEnterpriseId;
 

src/main/java/com/sooka/sponest/data/emergency/appmin/xunjian/service/impl/AppXunjianServiceImpl.java

@@ -9,7 +9,10 @@ import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.domain.SysDept;
 import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.api.model.LoginUser;
+import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
+import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.emergency.appmin.base.AppBaseService;
+import com.sooka.sponest.data.emergency.appmin.enterprise.domain.AppEnterpriseVO;
 import com.sooka.sponest.data.emergency.appmin.util.ImageUtil;
 import com.sooka.sponest.data.emergency.appmin.xunjian.domain.*;
 import com.sooka.sponest.data.emergency.appmin.xunjian.mapper.AppXunjianMapper;
@@ -26,7 +29,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 @Service
-public class AppXunjianServiceImpl extends AppBaseService implements AppXunjianService {
+public class AppXunjianServiceImpl extends BaseServiceImpl implements AppXunjianService {
     @Resource
     AppXunjianMapper appXunjianMapper;
     @Resource
@@ -125,6 +128,7 @@ public class AppXunjianServiceImpl extends AppBaseService implements AppXunjianS
 
     @Override
     public AjaxResult submitXunjian(AppXunjianVO vo) {
+        setSookaDataBase(vo);
         Map result = new HashMap();
         //是否有限期整改的
         Boolean haveXQZG = false;//限期整改
@@ -236,7 +240,7 @@ public class AppXunjianServiceImpl extends AppBaseService implements AppXunjianS
                 }
             }
             tBusLog.setBusEnterpriseId(vo.getBusEnterpriseId());
-            TBusEnterprise enterprise = tBusEnterpriseMapper.selectTBusEnterpriseByBusEnterpriseId(vo.getBusEnterpriseId());
+            TBusEnterprise enterprise = tBusEnterpriseMapper.selectTBusEnterpriseByBusEnterpriseId(vo);
             tBusLog.setBusEnterpriseName(enterprise.getBusinessName());
             tBusLog.setLatitude(vo.getLatitude());
             tBusLog.setLongitude(vo.getLongitude());
@@ -413,9 +417,11 @@ public class AppXunjianServiceImpl extends AppBaseService implements AppXunjianS
     @Override
     public AjaxResult saveZGTZS(AppZgtzsVO vo) {
         try {
+            AppEnterpriseVO appEnterpriseVO = new AppEnterpriseVO();
+            setSookaDataBase(appEnterpriseVO);
+            appEnterpriseVO.setBusEnterpriseId(vo.getXqzgtzs().getEnterpriseId());
 
-
-            TBusEnterprise enterprise = tBusEnterpriseMapper.selectTBusEnterpriseByBusEnterpriseId(vo.getXqzgtzs().getEnterpriseId());
+            TBusEnterprise enterprise = tBusEnterpriseMapper.selectTBusEnterpriseByBusEnterpriseId(appEnterpriseVO);
             SysDept sysDept = remoteSystemBaseService.selectDeptById(enterprise.getDeptId()).getData();
 
             //处理图片
@@ -473,13 +479,13 @@ public class AppXunjianServiceImpl extends AppBaseService implements AppXunjianS
         try {
             String logId = vo.getTzsFcyjgzs().getLogId();
             TBusLog tBusLog = tBusLogMapper.selectTBusLogByBusLogId(logId);
-
+            setSookaDataBase(tBusLog);
             vo.getTzsFcyjgzs().setEnterpriseId(tBusLog.getBusEnterpriseId());
             vo.getTzsFcyjgzs().setEnterpriseName(tBusLog.getBusEnterpriseName());
             vo.getTzsFcyjgzs().setTzsId(UUID.fastUUID().toString());
             vo.getTzsFcyjgzs().setCreateTime(new Date());
 
-            TBusEnterprise enterprise = tBusEnterpriseMapper.selectTBusEnterpriseByBusEnterpriseId(tBusLog.getBusEnterpriseId()) ;
+            TBusEnterprise enterprise = tBusEnterpriseMapper.selectTBusEnterpriseByBusEnterpriseId(tBusLog) ;
             SysDept sysDept = remoteSystemBaseService.selectDeptById(enterprise.getDeptId()).getData();
 
             String pictureBasePath = remoteSystemBaseService.configKeyapp("pictureBasePath").get("code").toString();

src/main/java/com/sooka/sponest/data/emergency/domain/TBusLog.java

@@ -2,6 +2,7 @@ package com.sooka.sponest.data.emergency.domain;
 
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -15,7 +16,7 @@ import java.util.Date;
  */
 @Getter
 @Setter
-public class TBusLog extends BaseEntity
+public class TBusLog extends BaseBusinessEntity
 {
     private static final long serialVersionUID = 1L;
 

src/main/java/com/sooka/sponest/data/emergency/domain/TBusPatrolstation.java

@@ -2,6 +2,7 @@ package com.sooka.sponest.data.emergency.domain;
 
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -11,10 +12,10 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author ruoyi
  * @date 2023-01-30
  */
-public class TBusPatrolstation extends BaseEntity
+public class TBusPatrolstation extends BaseBusinessEntity
 {
 
-    String searchValue;
+    private String searchValue;
 
     private static final long serialVersionUID = 1L;
 
@@ -51,6 +52,14 @@ public class TBusPatrolstation extends BaseEntity
 
     private String delFlag;
 
+    public String getSearchValue() {
+        return searchValue;
+    }
+
+    public void setSearchValue(String searchValue) {
+        this.searchValue = searchValue;
+    }
+
     public String getDelFlag() {
         return delFlag;
     }

src/main/java/com/sooka/sponest/data/emergency/domain/TTzsXhxqzggzs.java

@@ -3,6 +3,7 @@ package com.sooka.sponest.data.emergency.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
 import lombok.Data;
 
 import java.util.Date;
@@ -14,7 +15,7 @@ import java.util.Date;
  * @date 2023-01-10
  */
 @Data
-public class TTzsXhxqzggzs extends BaseEntity
+public class TTzsXhxqzggzs extends BaseBusinessEntity
 {
     private static final long serialVersionUID = 1L;
 

src/main/java/com/sooka/sponest/data/emergency/service/impl/TBusEnterpriseServiceImpl.java

@@ -4,6 +4,8 @@ import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.uuid.UUID;
 import com.ruoyi.common.datascope.annotation.DataScope;
 import com.ruoyi.common.security.utils.SecurityUtils;
+import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
+import com.sooka.sponest.data.emergency.appmin.enterprise.domain.AppEnterpriseVO;
 import com.sooka.sponest.data.emergency.domain.TBusEnterprise;
 import com.sooka.sponest.data.emergency.mapper.TBusEnterpriseMapper;
 import com.sooka.sponest.data.emergency.service.ITBusEnterpriseService;
@@ -19,7 +21,7 @@ import java.util.List;
  * @date 2022-11-15
  */
 @Service
-public class TBusEnterpriseServiceImpl implements ITBusEnterpriseService
+public class TBusEnterpriseServiceImpl extends BaseServiceImpl implements ITBusEnterpriseService
 {
     @Autowired
     private TBusEnterpriseMapper tBusEnterpriseMapper;
@@ -33,7 +35,10 @@ public class TBusEnterpriseServiceImpl implements ITBusEnterpriseService
     @Override
     public TBusEnterprise selectTBusEnterpriseByBusEnterpriseId(String busEnterpriseId)
     {
-        return tBusEnterpriseMapper.selectTBusEnterpriseByBusEnterpriseId(busEnterpriseId);
+        AppEnterpriseVO appEnterpriseVO = new AppEnterpriseVO();
+        setSookaDataBase(appEnterpriseVO);
+        appEnterpriseVO.setBusEnterpriseId(busEnterpriseId);
+        return tBusEnterpriseMapper.selectTBusEnterpriseByBusEnterpriseId(appEnterpriseVO);
     }
 
     /**

src/main/resources/mapper/emergency/system/TBusLogMapper.xml

@@ -62,9 +62,9 @@
     <sql id="selectTBusLogVo">
         select bus_log_id,
         bus_log_type,
-        (select dict_label from sys_dict_data where dict_value=bus_log_type) bus_log_type_value,
+        (select dict_label from ${database_system}.sys_dict_data where dict_value=bus_log_type) bus_log_type_value,
         log_source,
-        (select dict_label from sys_dict_data where dict_value=log_source) log_source_value,
+        (select dict_label from ${database_system}.sys_dict_data where dict_value=log_source) log_source_value,
         is_risk,
         (case is_risk when 1  then  '有' else '无'  end) is_risk_value,
         bus_enterprise_id, bus_enterprise_name,