Merge remote-tracking branch 'outside/master' into release-sy-v1.0.0

shuili-system/src/main/java/com/kms/common/utils/UserUtils.java

@@ -1,18 +1,27 @@
 package com.kms.common.utils;
 
 import cn.dev33.satoken.stp.StpUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.kms.framework.web.service.SysPermissionService;
 import com.kms.system.domain.SysXzqh;
 import com.kms.system.service.SysDeptService;
+import com.kms.system.service.SysRoleService;
 import com.kms.system.service.SysUserService;
 import com.kms.system.service.SysXzqhService;
+import com.kms.yxgh.df.domain.DfSysUserRole;
+import com.kms.yxgh.df.mapper.DfSysUserRoleMapper;
 import com.kms.yxgh.df.service.AuthorityDikeCodeService;
 import com.shuili.common.core.domain.entity.SysDept;
+import com.shuili.common.core.domain.entity.SysRole;
 import com.shuili.common.core.domain.entity.SysUser;
 import com.shuili.common.utils.SpringUtils;
 import com.shuili.common.utils.StringUtils;
+import org.springframework.util.CollectionUtils;
 
+import java.util.Arrays;
+import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 public class UserUtils {
 
@@ -21,6 +30,7 @@ public class UserUtils {
 
     private static SysPermissionService sysPermissionService = null;
 
+
     private static SysXzqhService sysXzqhService = null;
 
     private static SysDeptService sysDeptService = null;
@@ -55,6 +65,31 @@ public class UserUtils {
 
     public static String getAdcd() {
         SysUser user = getUser();
+        DfSysUserRoleMapper dfSysUserRoleMapper = SpringUtils.getBean(DfSysUserRoleMapper.class);
+        SysRoleService sysRoleService = SpringUtils.getBean(SysRoleService.class);
+
+        List<DfSysUserRole> sysUserRoles = dfSysUserRoleMapper.selectList(new LambdaQueryWrapper<DfSysUserRole>().eq(DfSysUserRole::getUserId, user.getId()));
+        if (!CollectionUtils.isEmpty(sysUserRoles)) {
+            List<String> roleIds = sysUserRoles.stream()
+                    .map(DfSysUserRole::getRoleId)
+                    .filter(roleId -> !org.springframework.util.StringUtils.isEmpty(roleId))
+                    .collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(roleIds)) {
+                List<SysRole> sysRoleIds = sysRoleService.list(new LambdaQueryWrapper<SysRole>()
+                        .in(SysRole::getId, roleIds)
+                );
+                if (!CollectionUtils.isEmpty(sysRoleIds)) {
+                    List<String> roleCodes = sysRoleIds.stream()
+                            .map(SysRole::getRoleKey)
+                            .collect(Collectors.toList());
+                    if (roleCodes.contains("YW00352")
+                            || roleCodes.contains("YW00402")) {
+                        return "";
+                    }
+                }
+            }
+        }
+
         if (user == null) {
             return "";
         }

shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFzrController.java

@@ -66,7 +66,6 @@ public class BsSgcDfFzrController extends BaseController {
 
         HashMap<String, HashMap<String, String>> dto = bsSgcSzFzrService.getHistogram(layer, xzqh);
 
-
         return dto;
 
     }

shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java

@@ -122,15 +122,21 @@ public class BsSgcDfSafeJbxxController extends BaseController {
     public IPage list(@RequestBody SearchParam<BsSgcDfSafeJbxx> sp) {
 
         Page<BsSgcDfSafeJbxx> page=new Page<>();
+        String adcdQx = sp.getData().getAdcdQx();
+        String dikeCode = sp.getData().getDikeCode();
         BsSgcDfSafeJbxx data = sp.getData();
+        if (StringUtils.isEmpty(data.getAdcdQx())&&StringUtils.isEmpty(data.getDikeCode())){
+            return page;
+        }
         page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()),
                     Wrappers.lambdaQuery(BsSgcDfSafeJbxx.class)
-                            .eq(data.getDikeCode()!=null,BsSgcDfSafeJbxx::getDikeCode,data.getDikeCode())
+                            .eq(StringUtils.isNotEmpty(data.getDikeCode()),BsSgcDfSafeJbxx::getDikeCode,data.getDikeCode())
                             .like(data.getDikeName() != null, BsSgcDfSafeJbxx::getDikeName, data.getDikeName())
                             .eq(data.getDikeType() != null, BsSgcDfSafeJbxx::getDikeType, data.getDikeType())
                             .eq(data.getStatus() != null, BsSgcDfSafeJbxx::getStatus, data.getStatus())
                             .eq(data.getDikeGrad() != null, BsSgcDfSafeJbxx::getDikeGrad, data.getDikeGrad())
-                            .likeRight(data.getAdcd()!=null,BsSgcDfSafeJbxx::getAdcd,data.getAdcd())
+                            .likeRight(StringUtils.isNotEmpty(data.getAdcdQx())&&StringUtils.isEmpty(data.getAdcd())&&StringUtils.isEmpty(data.getDikeCode()),BsSgcDfSafeJbxx::getAdcd,data.getAdcdQx())
+                            .likeRight(StringUtils.isNotEmpty(data.getAdcd()),BsSgcDfSafeJbxx::getAdcd,sysXzqhService.getSubString(data.getAdcd()))
                             .isNull(BsSgcDfSafeJbxx::getExprDate)
                             .orderByAsc(BsSgcDfSafeJbxx::getDikeGrad)
                             .orderByDesc(BsSgcDfSafeJbxx::getCreateTime));

shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFzr.java

@@ -120,6 +120,7 @@ public class BsSgcDfFzr extends BaseEntity implements IAdcd
 
     private String dikeCode;
 
+    @TableField(exist = false)
     private String adcd;
 
 

shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java

@@ -120,15 +120,21 @@ public class BsSgcSzSafeJbxxController extends BaseController {
     public IPage list(@RequestBody SearchParam<BsSgcSzSafeJbxx> sp) {
         Page<BsSgcSzSafeJbxx> page=new Page<>();
         BsSgcSzSafeJbxx data = sp.getData();
-
+        String adcd = data.getAdcd();
+        String adcdQx = data.getAdcdQx();
+        String wagaCode = data.getWagaCode();
+        if (StringUtils.isEmpty(data.getAdcdQx())&&StringUtils.isEmpty(data.getWagaCode())){
+            return page;
+        }
         page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()),
                     Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class)
-                            .eq(data.getWagaCode()!=null,BsSgcSzSafeJbxx::getWagaCode,data.getWagaCode())
+                            .eq(StringUtils.isNotEmpty(data.getWagaCode()),BsSgcSzSafeJbxx::getWagaCode,data.getWagaCode())
                             .like(data.getWagaName() != null, BsSgcSzSafeJbxx::getWagaName, data.getWagaName())
                             .eq(data.getWagaType() != null, BsSgcSzSafeJbxx::getWagaType, data.getWagaType())
                             .eq(data.getStatus() != null, BsSgcSzSafeJbxx::getStatus, data.getStatus())
                             .eq(data.getEngScal()!=null,BsSgcSzSafeJbxx::getEngScal,data.getEngScal())
-                            .likeRight(data.getAdcd()!=null,BsSgcSzSafeJbxx::getAdcd,data.getAdcdQx())
+                            .likeRight(StringUtils.isNotEmpty(data.getAdcdQx())&&StringUtils.isEmpty(data.getAdcd())&&StringUtils.isEmpty(data.getWagaCode()),BsSgcSzSafeJbxx::getAdcd,data.getAdcdQx())
+                            .likeRight(StringUtils.isNotEmpty(data.getAdcd()),BsSgcSzSafeJbxx::getAdcd,data.getAdcd())
                             .isNull(BsSgcSzSafeJbxx::getExprDate)
                             .last("ORDER BY CASE WHEN eng_scal IS NULL OR eng_scal = '' THEN 1 ELSE 0 END, eng_scal ASC")
             );

shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFzr.java

@@ -111,7 +111,7 @@ public class BsSgcSzFzr extends BaseEntity implements IAdcd
     private String type;
 
     @TableField(exist = false)
-    private String wageName;
+    private String wagaName;
 /*
     @TableField("waga_type")
     private String wagaType;*/
@@ -119,6 +119,7 @@ public class BsSgcSzFzr extends BaseEntity implements IAdcd
 
     private String wagaCode;
 
+    @TableField(exist = false)
     private String adcd;
 
 

shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java

@@ -47,7 +47,7 @@ public class BsSgcSzFzrService extends BaseService<BsSgcSzFzrMapper, BsSgcSzFzr>
         BsSgcSzFzr projectInfo = sp.getData();
 
         if (projectInfo != null) {
-            String projectName = projectInfo.getWageName();
+            String projectName = projectInfo.getWagaName();
 //            String projectType = projectInfo.getWagaType();
 
             queryWrapper.eq(projectInfo.getWagaCode()!=null,"waga_code", projectInfo.getWagaCode());
@@ -96,7 +96,7 @@ public class BsSgcSzFzrService extends BaseService<BsSgcSzFzrMapper, BsSgcSzFzr>
          }else {
              adcd=data.getAdcdQx();
          }
-        List<BsSgcSzFzr> list = bsSgcSzFzrMapper.getList(data.getId(), data.getWageName(), adcd, sp.getData().getWagaCode(),
+        List<BsSgcSzFzr> list = bsSgcSzFzrMapper.getList(data.getId(), data.getWagaName(), adcd, sp.getData().getWagaCode(),
                     (String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize());
 
         Page<BsSgcSzFzr> page = new Page<>();

shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml

@@ -5,8 +5,8 @@
 <mapper namespace="com.kms.yg.df.mapper.BsSgcDfFzrMapper">
 
     <sql id="info">
-        select sj.dike_name,
-                sf.*
+        select  dike_NAME,  DIKE_PATT, DIKE_START_LONG, DIKE_START_LAT, DIKE_END_LONG, DIKE_END_LAT, DIKE_LOC, DIKE_TYPE, DIKE_USE, DIKE_GRAD, MAIN_BUILD_GRAD, DES_LOCK_DISC, GAOR_NUM, GAOR_TOT_NET_WID, ENG_STAT, START_DATE, COMP_DATE, ADM_DEP, is_gate_project, observation_project, level_datum, dike_overview, status, security_category, sj.adcd, hz_status, zx_status, reason, START_LOC, END_LOC, dike_len, DIKE_START_NUM, DIKE_END_NUM, ENG_TASK, DIKE_RIVER, DIKE_RVBK, DIKE_PLN_STDA, DIKE_CRT_STDA, DIKE_STDA_LEN, DIKE_NOT_STDA_LEN, DIKE_NOT_STDA_LOC, ELEV_SYS, START_DIKE_TOP_EL, END_DIKE_TOP_EL, DIKE_WAWA_MIN_ELEV, DIKE_WAWA_MAX_ELEV, DIKE_WAWA_MIN_LOC, DIKE_WAWA_MAX_LOC, DIKE_ELEV_MIN, DIKE_ELEV_MAX, DIKE_HEIG_MIN, DIKE_HEIG_MAX, DIKE_TOP_WID_MIN, DIKE_TOP_WID_MAX, SLUICES_AMOUNT, PUMPS_AMOUNT, NOTE, EFF_DATE, EXPR_DATE, ELEV_SYS_CONVER, MNUN,
+                sf.id, name, unit, duties, phone, person_responsible_type, competent_department, competent_department_duties, effective_date,  pro_code, pro_no,  type, safety_type, person_type,sf.create_time
         from bs_sgc_df_fzr sf
                  left join att_dike_base sj on sf.dike_code = sj.dike_code
     </sql>
@@ -74,7 +74,6 @@
             <if test="adcd != null and adcd != ''">
                 and sj.adcd like concat(#{adcd},'%')
             </if>
-            <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
         </where>
         order by ${orderBy} desc LIMIT #{pageNum},#{pageSize};
     </select>

shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml

@@ -5,8 +5,13 @@
 <mapper namespace="com.kms.yg.sz.mapper.BsSgcSzFzrMapper">
 
     <sql id="info">
-        select sj.waga_name,
-                sf.*
+        select  WAGA_NAME, ENG_SCAL, WAGA_START_LONG, WAGA_START_LAT, WAGA_END_LONG,
+               WAGA_END_LAT, WAGA_LOC, WAGA_TYPE, WAGA_USE, ENG_GRAD, MAIN_BUILD_GRAD, DES_LOCK_DISC,
+               GAOR_NUM, GAOR_TOT_NET_WID, ENG_STAT, START_DATE, COMP_DATE, ADM_DEP, is_gate_project,
+               observation_project, level_datum, sluice_overview,  status, security_category, sj.adcd,
+               hz_status, zx_status, reason, MNUN, NOTE, EFF_DATE, EXPR_DATE, WAGA_CEN_LONG, WAGA_CEN_LAT, IF_CEB, IF_HYJ, IF_GSE, IF_SGE, FREQIN, CHECK_DATE, WAGA_OV, UPDATE_DATE,
+                sf.id, name, unit, duties, phone, person_responsible_type, competent_department, competent_department_duties, effective_date, pro_code, pro_no, type, safety_type, person_type,
+                sf.create_time
         from bs_sgc_sz_fzr sf
                  left join att_waga_base sj on sf.waga_code = sj.waga_code
     </sql>
@@ -32,7 +37,7 @@
 
     <resultMap type="BsSgcSzFzr" id="BsSgcSzFzr">
         <id     property="id"     column="id"     />
-        <result property="wageName" column="waga_name"/>
+        <result property="wagaName" column="WAGA_NAME"/>
         <result property="name" column="name"/>
         <result property="unit" column="unit"/>
         <result property="duties" column="duties"/>
@@ -74,7 +79,6 @@
             <if test="adcd != null and adcd != ''">
                 and sj.adcd like concat(#{adcd},'%')
             </if>
-            <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
         </where>
         order by ${orderBy} desc LIMIT #{pageNum},#{pageSize};
     </select>