Merge remote-tracking branch 'origin/master_tuzuo' into master_tuzuo

src/main/java/com/sooka/sponest/data/emergency/appmin/enterprise/service/impl/AppEnterpriseServiceImpl.java

@@ -94,6 +94,7 @@ public class AppEnterpriseServiceImpl extends BaseServiceImpl implements AppEnte
             }
             TBusEnterprise enterprise = new TBusEnterprise();
             enterprise.setOrgCode(vo.getOrgCode());
+            setSookaDataBase(enterprise);
             List list = tBusEnterpriseMapper.selectTBusEnterpriseList(enterprise);
             if (list.size() > 0) {
                 return AjaxResult.error("组织机构代码证已经被登记！");

src/main/java/com/sooka/sponest/data/emergency/appmin/material/controller/AppMaterialController.java

@@ -27,16 +27,12 @@ public class AppMaterialController extends BaseController {
         try {
             // 开启分页
             startPage();
-
             // 查询数据
             List list = appMaterialService.geMaterialList(vo);
-
             // 移除空值
             list.removeAll(Collections.singleton(null));
-
             // 获取分页信息
             TableDataInfo tableDataInfo = getDataTable(list);
-
             // 直接返回数据，不需要手动构建 Map
             return AjaxResult.success(tableDataInfo.getRows());
         } catch (Exception e) {

src/main/java/com/sooka/sponest/data/emergency/appmin/material/domain/AppMaterialVO.java

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

src/main/java/com/sooka/sponest/data/emergency/appmin/material/service/impl/AppMaterialServiceImpl.java

@@ -1,6 +1,7 @@
 package com.sooka.sponest.data.emergency.appmin.material.service.impl;
 
 import com.ruoyi.common.datascope.annotation.DataScope;
+import com.ruoyi.common.datascope.base.service.BaseService;
 import com.sooka.sponest.data.emergency.appmin.base.AppBaseService;
 import com.sooka.sponest.data.emergency.appmin.material.domain.AppMaterialVO;
 import com.sooka.sponest.data.emergency.appmin.material.service.AppMaterialService;
@@ -12,7 +13,7 @@ import javax.annotation.Resource;
 import java.util.List;
 
 @Service
-public class AppMaterialServiceImpl extends AppBaseService implements AppMaterialService {
+public class AppMaterialServiceImpl extends BaseService implements AppMaterialService {
 
     @Resource
     TBusMaterialMapper tBusMaterialMapper;
@@ -23,6 +24,7 @@ public class AppMaterialServiceImpl extends AppBaseService implements AppMateria
         TBusMaterial tBusMaterial = new TBusMaterial();
         tBusMaterial.setMaterialName(vo.getMaterialName());
         tBusMaterial.setParams(vo.getParams());
+        setSookaDataBase(tBusMaterial);
         List ls = tBusMaterialMapper.selectTBusMaterialList(tBusMaterial);
         return ls;
     }

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

@@ -34,8 +34,6 @@ public class AppPatrolstationServiceImpl extends BaseServiceImpl implements AppP
             if(tBusPatrolstationMapper.selectTBusPatrolstationList(t).size()>0){
                 return AjaxResult.error("已有此巡更点编码,不能重复添加！");
             }
-
-
             TBusPatrolstation tBusPatrolstation = new TBusPatrolstation();
             tBusPatrolstation.setBusPatrolstationId(UUID.fastUUID().toString());
             tBusPatrolstation.setBusEnterpriseId(vo.getBusEnterpriseId());

src/main/java/com/sooka/sponest/data/emergency/appmin/warehouse/controller/AppWarehouseController.java

@@ -26,7 +26,7 @@ public class AppWarehouseController extends BaseController {
             List list =appWarehouseService.getWarehouseList(vo);
             list.removeAll(Collections.singleton(null));
             TableDataInfo tableDataInfo = getDataTable(list);
-            return AjaxResult.success(tableDataInfo);
+            return AjaxResult.success(tableDataInfo.getRows());
         }catch (Exception e){
             e.printStackTrace();
             return AjaxResult.error("查询失败");

src/main/java/com/sooka/sponest/data/emergency/appmin/warehouse/domain/AppWarehouseVO.java

@@ -1,12 +1,13 @@
 package com.sooka.sponest.data.emergency.appmin.warehouse.domain;
 
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
-public class AppWarehouseVO extends BaseEntity {
+public class AppWarehouseVO extends BaseBusinessEntity {
 
     String warehouseName;
     String longitude;

src/main/java/com/sooka/sponest/data/emergency/appmin/warehouse/service/impl/AppWarehouseServiceImpl.java

@@ -1,6 +1,7 @@
 package com.sooka.sponest.data.emergency.appmin.warehouse.service.impl;
 
 import com.ruoyi.common.datascope.annotation.DataScope;
+import com.ruoyi.common.datascope.base.service.BaseService;
 import com.sooka.sponest.data.emergency.appmin.base.AppBaseService;
 import com.sooka.sponest.data.emergency.appmin.warehouse.domain.AppWarehouseVO;
 import com.sooka.sponest.data.emergency.appmin.warehouse.service.AppWarehouseService;
@@ -12,7 +13,7 @@ import javax.annotation.Resource;
 import java.util.List;
 
 @Service
-public class AppWarehouseServiceImpl extends AppBaseService implements AppWarehouseService {
+public class AppWarehouseServiceImpl extends BaseService implements AppWarehouseService {
 
     @Resource
     TBusWarehouseMapper tBusWarehouseMapper;
@@ -25,6 +26,7 @@ public class AppWarehouseServiceImpl extends AppBaseService implements AppWareho
         tBusWarehouse.setLatitude(vo.getLatitude());
         tBusWarehouse.setLongitude(vo.getLongitude());
         tBusWarehouse.setParams(vo.getParams());
+        setSookaDataBase(tBusWarehouse);
         return tBusWarehouseMapper.selectTBusWarehouseListOrderByDistance(tBusWarehouse);
     }
 }

src/main/java/com/sooka/sponest/data/emergency/appmin/xungeng/controller/AppXungengController.java

@@ -31,7 +31,7 @@ public class AppXungengController extends BaseController {
             List list  = appXungengService.getXungengInfo(vo);
             list.removeAll(Collections.singleton(null));
             TableDataInfo tableDataInfo = getDataTable(list);
-            return AjaxResult.success(tableDataInfo);
+            return AjaxResult.success(tableDataInfo.getRows());
         }catch (Exception e){
             e.printStackTrace();
             return AjaxResult.error("查询失败");

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

@@ -97,6 +97,7 @@ public class AppXungengServiceImpl extends BaseServiceImpl implements AppXungeng
         try{
             TBusLog tBusLog = new TBusLog();
             tBusLog.setBusPatrolstationId(vo.getBusPatrolstationId());
+            setSookaDataBase(tBusLog);
             List list = logMapper.selectTBusLogList(tBusLog);
             return  list;
         }catch (Exception e){

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

@@ -69,7 +69,7 @@ public class AppXunjianController {
     }
 
     @RequestMapping("deleteXunjianItem")
-    public AjaxResult deleteXunjianItem(AppXunjianVO vo) {
+    public AjaxResult deleteXunjianItem(@RequestBody AppXunjianVO vo) {
         return appXunjianService.deleteXunjianItem(vo);
     }
 

src/main/java/com/sooka/sponest/data/emergency/domain/TBusEnterprise.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.Data;
 
 /**
@@ -11,7 +12,7 @@ import lombok.Data;
  * @date 2022-11-15
  */
 @Data
-public class TBusEnterprise extends BaseEntity
+public class TBusEnterprise extends BaseBusinessEntity
 {
     private static final long serialVersionUID = 1L;
 

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

@@ -2,7 +2,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.ruoyi.common.datascope.base.domain.BaseBusinessEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -14,7 +14,7 @@ import java.util.Date;
  * @author ruoyi
  * @date 2023-01-06
  */
-public class TBusMaterial extends BaseEntity
+public class TBusMaterial extends BaseBusinessEntity
 {
     private static final long serialVersionUID = 1L;
 
@@ -190,7 +190,6 @@ public class TBusMaterial extends BaseEntity
             .append("productionDate", getProductionDate())
             .append("connector", getConnector())
             .append("connectorPhone", getConnectorPhone())
-            .append("remark", getRemark())
             .toString();
     }
 }

src/main/java/com/sooka/sponest/data/emergency/domain/TBusWarehouse.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.ruoyi.common.datascope.base.domain.BaseBusinessEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -11,7 +12,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author ruoyi
  * @date 2023-01-06
  */
-public class TBusWarehouse extends BaseEntity
+public class TBusWarehouse extends BaseBusinessEntity
 {
     private static final long serialVersionUID = 1L;
 
@@ -45,12 +46,10 @@ public class TBusWarehouse extends BaseEntity
     private String dis;
 
 
-    @Override
     public String getRemark() {
         return remark;
     }
 
-    @Override
     public void setRemark(String remark) {
         this.remark = remark;
     }

src/main/resources/mapper/emergency/appmin/AppXunjianimgMapper.xml

@@ -21,8 +21,8 @@
         (select parent_id from t_bus_items where bus_items_id=i.bus_items_id) ejId,
         (select bus_items_name from t_bus_items where bus_items_id = (select parent_id from t_bus_items where
         bus_items_id=i.bus_items_id)) ejName,
-        (select dict_label from sys_dict_data where dict_value= i.items_type) itemsTypeValue,
-        (select dict_label from sys_dict_data where dict_value=i.risk_status) riskStatusValue,
+        (select dict_label from onest_system.sys_dict_data where dict_value= i.items_type) itemsTypeValue,
+        (select dict_label from onest_system.sys_dict_data where dict_value=i.risk_status) riskStatusValue,
         (select g.bus_enterprise_name from t_bus_log g where g.bus_log_id=i.bus_log_id) busEnterpriseName,
 
         (select attach_url from t_attach

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

@@ -60,7 +60,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTBusEnterpriseList" parameterType="TBusEnterprise" resultMap="TBusEnterpriseResult">
         <include refid="selectTBusEnterpriseVo"/>
         <where>
-            e.del_flag = '0'
             <if test="deptId != null "> and e.dept_id = #{deptId}</if>
             <if test="deptName != null "> and d.dept_name like concat('%', #{deptName}, '%')</if>
             <if test="userName != null "> and u.nick_name like concat('%', #{userName}, '%')</if>
@@ -77,7 +76,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tradeDept != null  and tradeDept != ''"> and e.trade_dept = #{tradeDept}</if>
             <if test="longitude != null  and longitude != ''"> and e.longitude = #{longitude}</if>
             <if test="latitude != null  and latitude != ''"> and e.latitude = #{latitude}</if>
-            <if test="dataStatus != null  and dataStatus != ''"> and e.data_status = #{dataStatus}</if>
             <if test="enterpriseCode != null  and enterpriseCode != ''"> and e.enterprise_code = #{enterpriseCode}</if>
             <!-- 数据范围过滤 -->
             ${params.dataScope}
@@ -85,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by e.create_time desc
     </select>
 
-    <select id="selectTBusEnterpriseByBusEnterpriseId" parameterType="Object" resultMap="TBusEnterpriseResult">
+    <select id="selectTBusEnterpriseByBusEnterpriseId" parameterType="TBusEnterprise" resultMap="TBusEnterpriseResult">
         <include refid="selectTBusEnterpriseVo"/>
         where bus_enterprise_id = #{busEnterpriseId}
     </select>
@@ -110,7 +108,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="longitude != null">longitude,</if>
             <if test="latitude != null">latitude,</if>
-            <if test="dataStatus != null">data_status,</if>
             <if test="enterpriseCode != null">enterprise_code,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -131,7 +128,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="longitude != null">#{longitude},</if>
             <if test="latitude != null">#{latitude},</if>
-            <if test="dataStatus != null">#{dataStatus},</if>
             <if test="enterpriseCode != null">#{enterpriseCode},</if>
          </trim>
     </insert>

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

@@ -77,14 +77,14 @@
     <select id="selectTBusLogList" parameterType="TBusLog" resultMap="TBusLogResult">
         select g.bus_log_id,
         g.bus_log_type,
-        (select dict_label from sys_dict_data where dict_value=g.bus_log_type) bus_log_type_value,
+        (select dict_label from ${database_system}.sys_dict_data where dict_value=g.bus_log_type) bus_log_type_value,
         log_source,
-        (select dict_label from sys_dict_data where dict_value=g.log_source) log_source_value,
+        (select dict_label from ${database_system}.sys_dict_data where dict_value=g.log_source) log_source_value,
         g.is_risk,
         (case g.is_risk when 1 then '有' else '无' end) is_risk_value,
         g.bus_enterprise_id, g.bus_enterprise_name,
         g.risk_status,
-        (select dict_label from sys_dict_data where dict_value=g.risk_status) risk_status_value,
+        (select dict_label from ${database_system}.sys_dict_data where dict_value=g.risk_status) risk_status_value,
         g.longitude, g.latitude,g.create_time,g.bus_patrolstation_id,g.bus_patrolstation_name,
         date_format(g.create_time,'%Y-%m-%d %H:%m:%s') create_time_str from t_bus_log g,t_bus_dept d
         <where>

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

@@ -28,8 +28,7 @@
         p.bus_enterprise_name bus_enterprise_name,
         p.longitude longitude,
         p.latitude latitude,
-        p.remarks remarks,
-        (case p.del_flag when 1 then '废弃' else '' end) del_flag
+        p.remarks remarks
         from t_bus_patrolstation p,
         t_bus_enterprise e