数据字典添加分别字符key

liujun001
1 parent c5cf607f
Showing 3 changed files with 66 additions and 18 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssEquipmentController.java
Bsth-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
Bsth-system/src/main/resources/mapper/system/SysDictDataMapper.xml
@@ -250,7 +250,10 @@ public class DssEquipmentController extends BaseController {
                     equimentAddressParamVo.setInteger(Convert.toInt(sysDictData.getDictValue()));
                 }
             } else if (Objects.equals(sysDictData.getDictType(), "resource_base_url") && Objects.nonNull(sysDictData.getDictValue())) {
-                configVo.setResourceBashURL(sysDictData.getDictValueStr());
+                if (StringUtils.equals(sysDictData.getDiscKey(), "resource_base_url")) {
+                    configVo.setResourceBashURL(Objects.nonNull(sysDictData.getDictValue()) ? sysDictData.getDictValue().toString() : null);
+                }
+
             }
         }
 package com.ruoyi.driver.service.impl;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Paths;
-import java.time.LocalDateTime;
-import java.time.temporal.ChronoUnit;
-import java.util.*;
-import java.util.stream.Collectors;
-
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.http.HttpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -19,6 +10,7 @@ import com.ruoyi.common.cache.SchedulingCache;
 import com.ruoyi.common.cache.TempCache;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.exception.file.InvalidExtensionException;
 import com.ruoyi.common.global.Result;
@@ -27,12 +19,15 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.common.utils.file.MimeTypeUtils;
+import com.ruoyi.domain.DriverScheduling;
+import com.ruoyi.domain.EquipmentDriverExpand;
+import com.ruoyi.driver.domain.Driver;
+import com.ruoyi.driver.mapper.DriverMapper;
+import com.ruoyi.driver.service.IDriverService;
 import com.ruoyi.equipment.mapper.EquipmentMapper;
 import com.ruoyi.framework.config.ServerConfig;
 import com.ruoyi.job.DriverJob;
 import com.ruoyi.pojo.DriverSignInRecommendation;
-import com.ruoyi.domain.EquipmentDriverExpand;
-import com.ruoyi.domain.DriverScheduling;
 import com.ruoyi.pojo.request.DriverRequestVo;
 import com.ruoyi.pojo.request.DriverSignInRequestVo;
 import com.ruoyi.pojo.request.FaceUpdateReqVo;
@@ -44,9 +39,11 @@ import com.ruoyi.service.RuleAttendanceMainService;
 import com.ruoyi.service.SchedulingService;
 import com.ruoyi.service.ThreadJobService;
 import com.ruoyi.system.domain.SysNotice;
+import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.system.service.ISysNoticeService;
 import com.ruoyi.utils.ConstDateUtil;
 import com.ruoyi.utils.ListUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.tomcat.util.buf.StringUtils;
 import org.slf4j.Logger;
@@ -54,15 +51,20 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import com.ruoyi.driver.mapper.DriverMapper;
-import com.ruoyi.driver.domain.Driver;
-import com.ruoyi.driver.service.IDriverService;
 import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Paths;
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
+import java.util.*;
+import java.util.stream.Collectors;
 import static com.ruoyi.common.ApiProperties.PERSONNEL_API_KEY;
 import static com.ruoyi.common.ConstDriverProperties.*;
@@ -70,8 +72,6 @@ import static com.ruoyi.common.ConstSignInConstSignInProperties.*;
 import static com.ruoyi.common.redispre.GlobalRedisPreName.DRIVER_SCHEDULING_PRE;
 import static com.ruoyi.common.redispre.GlobalRedisPreName.REDIS_SIGN_IN_DRIVER_ALCOHOL_OVERFLOW;
-import com.ruoyi.driver.service.IDriverService;
-
 /**
  * 驾驶员信息Service业务层处理
  *
@@ -113,6 +113,8 @@ public class DriverServiceImpl extends ServiceImpl&lt;DriverMapper, Driver&gt; impleme
     private ServerConfig serverConfig;
     @Autowired
     private DriverMapper driverMapper;
+    @Autowired
+    private ISysDictDataService sysDictDataService;
     @Autowired
     private ThreadJobService threadJobService;
@@ -146,12 +148,51 @@ public class DriverServiceImpl extends ServiceImpl&lt;DriverMapper, Driver&gt; impleme
     @Override
     public List<Driver> selectDriverList(DriverRequestVo driver) {
         List<Driver> drivers = driverMapper.selectDriverList(driver);
+
+        SysDictData source = new SysDictData();
+        source.setDictType("resource_base_url");
+        List<SysDictData> sysDictDatas = sysDictDataService.queryDictDateList(source);
+
+        String url1 = "";
+        String flag1 = null;
+
+        if (CollectionUtils.isNotEmpty(sysDictDatas)) {
+            for (SysDictData s : sysDictDatas) {
+                if (Objects.equals(s.getDiscKey(), "resource_base_url")) {
+                    url1 = s.getDictValueStr();
+                    continue;
+                }
+
+                if (org.apache.commons.lang3.StringUtils.equals(s.getDiscKey(), "resource_base_url_flag")) {
+                    flag1 = s.getDictValueStr();
+                    continue;
+                }
+            }
+        }
+
+        String url = url1;
+        String flag = flag1;
+
         List<EquipmentDriverExpand> list = equipmentMapper.querySignListByJobCode(drivers);
         for (Driver item : drivers) {
             // 查询对应工号的注册设备号 然后用，拼接展示在前端
             List<String> collect = list.stream().filter(todo -> item.getJobCode().equals(todo.getJobCode())).map(EquipmentDriverExpand::getDeviceId).collect(Collectors.toList());
             item.setSignInEquipment(StringUtils.join(collect));
         }
+        if (org.apache.commons.lang3.StringUtils.equals("1", flag)) {
+            drivers = drivers.stream().map(d -> {
+                String fil = "/";
+
+                if (org.apache.commons.lang3.StringUtils.startsWith(d.getImage(), "/") || org.apache.commons.lang3.StringUtils.startsWith(d.getImage(), "\\")) {
+                    fil = "";
+                } else if (org.apache.commons.lang3.StringUtils.endsWith(url, "/")) {
+                    fil = "";
+                }
+                d.setImage(org.apache.commons.lang3.StringUtils.join(url, fil, d.getImage()));
+
+                return d;
+            }).collect(Collectors.toList());
+        }
         return drivers;
     }
@@ -18,10 +18,11 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 		<result property="createTime" column="create_time" />
 		<result property="updateBy"   column="update_by"   />
 		<result property="updateTime" column="update_time" />
+		<result property="discKey" column="disc_key" />
 	</resultMap>
 	<sql id="selectDictDataVo">
-        select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark 
+        select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark,disc_key
 		from sys_dict_data
     </sql>
@@ -84,6 +85,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
  			<if test="status != null">status = #{status},</if>
  			<if test="remark != null">remark = #{remark},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+			<if test="discKey != null and discKey != ''">disc_key=#{discKey},</if>
  			update_time = sysdate()
  		</set>
  		where dict_code = #{dictCode}
@@ -105,6 +107,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
  			<if test="status != null">status,</if>
  			<if test="remark != null and remark != ''">remark,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
+		   <if test="discKey != null and discKey != ''">disc_key,</if>
  			create_time
  		)values(
  		    <if test="dictSort != null">#{dictSort},</if>
@@ -117,6 +120,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
  			<if test="status != null">#{status},</if>
  			<if test="remark != null and remark != ''">#{remark},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
+			<if test="discKey != null and discKey != ''">#{discKey},</if>
  			sysdate()
  		)
 	</insert>