feat:1.新需求提交

jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java

@@ -9,6 +9,7 @@ import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.Profile;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
@@ -40,6 +41,7 @@ import java.util.stream.Collectors;
 @EnableSwagger2    //开启 Swagger2
 @EnableKnife4j     //开启 knife4j，可以不写
 @Import(BeanValidatorPluginsConfiguration.class)
+@Profile("!prod")
 public class Swagger2Config implements WebMvcConfigurer {
 
     /**

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/algorithm/AnalysisAlgorithm.java

@@ -583,7 +583,7 @@ public class AnalysisAlgorithm {
         }
 
 
-        // 2.循环遍历单元设备中心里程落在检查项目【开始-结束】这个区间视为这个区间的单元设备
+        // 2.循环遍历单元设备测点里程落在单元【开始-结束】这个区间视为这个区间的单元设备检查数据
         List<MovementAdditiveInfoUnitDeviceMap> additiveInfoUnitMaps = new ArrayList<>();
         int analysisType = analysisBatch.getAnalysisType();
         for (Map<String, Object> unitDevice : unitDeviceList) {
@@ -1379,9 +1379,10 @@ public class AnalysisAlgorithm {
     /**
      * 创建轨检车测点得分
      */
-    private AnalysisBatchUnitDevicePointScore createRailVehicleCheckTransfinitePointScore(AnalysisBatch
-                                                                                                  analysisBatch, List<MovementOverReport> currentUnitDeviceOverReportList, String overrunType, BigDecimal
-                                                                                                  weightValue) {
+    private AnalysisBatchUnitDevicePointScore createRailVehicleCheckTransfinitePointScore(AnalysisBatch analysisBatch,
+                                                                                          List<MovementOverReport> currentUnitDeviceOverReportList,
+                                                                                          String overrunType,
+                                                                                          BigDecimal weightValue) {
         if (ObjectUtil.isEmpty(currentUnitDeviceOverReportList)) {
             return null;
         }

jeecg-module-system/src/main/java/org/jeecg/modules/iam/service/impl/IamServiceImpl.java

@@ -4,7 +4,9 @@ import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.PasswordUtil;
 import org.jeecg.common.util.RedisUtil;
+import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.base.service.BaseCommonService;
 import org.jeecg.modules.iam.dto.IamResponseDTO;
 import org.jeecg.modules.iam.req.IamReq;
@@ -25,6 +27,8 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.List;
 
+import static org.jeecg.common.constant.CommonConstant.DEFAULT_PASSWORD;
+
 @Service
 public class IamServiceImpl implements IamService {
 
@@ -76,9 +80,14 @@ public class IamServiceImpl implements IamService {
                 currentUser = new SysUser();
                 currentUser.setUsername(loginInfo.getUserCode());
                 currentUser.setRealname(loginInfo.getUserName());
-                currentUser.setPassword("123456");
                 currentUser.setWorkNo(loginInfo.getUserCode());
-                currentUser.setDelFlag(0);
+                String salt = oConvertUtils.randomGen(8);
+                currentUser.setSalt(salt); //加盐
+                String passwordEncode = PasswordUtil.encrypt(loginInfo.getUserCode(), DEFAULT_PASSWORD, salt);
+                currentUser.setPassword(passwordEncode);// 默认密码
+                currentUser.setUserIdentity(1);// 正式员工身份
+                currentUser.setWorkNo(loginInfo.getUserCode());
+                currentUser.setDelFlag(CommonConstant.DEL_FLAG_0);
                 currentUser.setLoginTenantId(0);
                 currentUser.setStatus(CommonConstant.USER_UNFREEZE);
                 sysUserService.save(currentUser);
@@ -94,6 +103,7 @@ public class IamServiceImpl implements IamService {
                 SysUserRole sysUserRole = new SysUserRole();
                 sysUserRole.setRoleId(role.getId());
                 sysUserRole.setUserId(currentUser.getId());
+                sysUserRole.setTenantId(0);
                 sysUserRoleService.save(sysUserRole);
             }
 

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/controller/WorkBatchController.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.exception.JeecgBootException;
@@ -15,6 +16,7 @@ import org.jeecg.modules.maintenanceWork.entity.WorkBatch;
 import org.jeecg.modules.maintenanceWork.entity.WorkBatchDetail;
 import org.jeecg.modules.maintenanceWork.service.IWorkBatchService;
 import org.jeecg.modules.maintenanceWork.vo.WorkBatchDetailModifyVO;
+import org.jeecg.modules.maintenanceWork.vo.WorkBatchUserVO;
 import org.jeecg.modules.maintenanceWork.vo.WorkBatchVO;
 import org.jeecg.modules.maintenanceWork.service.IWorkBatchDetailService;
 import org.jeecg.modules.maintenanceWork.service.IWorkBatchDetailModifyService;
@@ -57,6 +59,18 @@ public class WorkBatchController extends JeecgController<WorkBatch, IWorkBatchSe
         return Result.OK(pageData);
     }
 
+    @AutoLog(value = "维修作业管理-作业计划批次管理-获取派工用户")
+    @ApiOperation(value = "维修作业管理-作业计划批次管理-获取派工用户", notes = "维修作业管理-作业计划批次管理-获取派工用户")
+    @GetMapping(value = "/listUser")
+    @ApiParam(name = "query", value = "查询名称/账号", required = true)
+    public Result<List<WorkBatchUserVO>> listUser(String query) {
+
+        List<WorkBatchUserVO> userList = this.service.listUser(query);
+
+        return Result.OK(userList);
+    }
+
+
     @AutoLog(value = "维修作业管理-作业计划批次管理-维修作业管理页面新增")
     @ApiOperation(value = "维修作业管理-作业计划批次管理-维修作业管理页面新增", notes = "维修作业管理-作业计划批次管理-维修作业管理页面新增")
     @PostMapping(value = "/saveRecord")
@@ -76,6 +90,7 @@ public class WorkBatchController extends JeecgController<WorkBatch, IWorkBatchSe
         return Result.OK("操作成功");
     }
 
+
     @AutoLog(value = "维修作业管理-作业计划批次管理-超限页面新增")
     @ApiOperation(value = "维修作业管理-作业计划批次管理-超限页面新增", notes = "维修作业管理-作业计划批次管理-超限页面新增")
     @PostMapping(value = "/transfiniteSaveRecord")

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/mapper/WorkBatchMapper.java

@@ -6,6 +6,7 @@ import org.jeecg.modules.maintenanceWork.dto.UnitDeviceDTO;
 import org.jeecg.modules.maintenanceWork.dto.WorkBatchDTO;
 import org.jeecg.modules.maintenanceWork.entity.WorkBatch;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.maintenanceWork.vo.WorkBatchUserVO;
 import org.jeecg.modules.maintenanceWork.vo.WorkBatchVO;
 import org.jeecg.modules.unitDevice.dto.CaseReportCheckDataDTO;
 import org.jeecg.modules.unitDevice.dto.CaseReportWorkBatchDTO;
@@ -32,4 +33,6 @@ public interface WorkBatchMapper extends BaseMapper<WorkBatch> {
     Page<CaseReportWorkBatchVO> caseReportWorkBatch(Page<CaseReportWorkBatchVO> pageData, CaseReportWorkBatchDTO dto);
 
     List<ToDoDetailVO> getTodoList(String currentUserId);
+
+    List<WorkBatchUserVO> listUser(String query);
 }

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/mapper/xml/WorkBatchMapper.xml

@@ -167,4 +167,19 @@
             AND t1.create_by = #{currentUserId}
         </if>
     </select>
+    <select id="listUser" resultType="org.jeecg.modules.maintenanceWork.vo.WorkBatchUserVO">
+        SELECT
+            t1.id user_id,
+            t1.username,
+            t1.realname,
+            t1.user_identity,
+            t3.role_name
+        FROM
+            sys_user t1
+        INNER JOIN sys_user_role t2 ON t2.user_id = t1.id
+        INNER JOIN sys_role t3 ON t3.id = t2.role_id
+        WHERE
+            t1.del_flag = 0
+          AND (t1.username LIKE concat('%',#{query},'%') OR t1.realname LIKE concat('%',#{query},'%'))
+    </select>
 </mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/service/IWorkBatchService.java

@@ -5,6 +5,7 @@ import org.jeecg.modules.homePage.vo.ToDoDetailVO;
 import org.jeecg.modules.maintenanceWork.dto.*;
 import org.jeecg.modules.maintenanceWork.entity.WorkBatch;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.maintenanceWork.vo.WorkBatchUserVO;
 import org.jeecg.modules.maintenanceWork.vo.WorkBatchVO;
 import org.jeecg.modules.unitDevice.dto.CaseReportCheckDataDTO;
 import org.jeecg.modules.unitDevice.dto.CaseReportWorkBatchDTO;
@@ -41,4 +42,6 @@ public interface IWorkBatchService extends IService<WorkBatch> {
     Page<CaseReportWorkBatchVO> caseReportWorkBatch(Page<CaseReportWorkBatchVO> pageData, CaseReportWorkBatchDTO dto);
 
     List<ToDoDetailVO> getTodoList(String currentUserId);
+
+    List<WorkBatchUserVO> listUser(String query);
 }

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/service/impl/WorkBatchServiceImpl.java

@@ -27,6 +27,7 @@ import org.jeecg.modules.maintenanceWork.mapper.WorkBatchDetailModifyMapper;
 import org.jeecg.modules.maintenanceWork.mapper.WorkBatchMapper;
 import org.jeecg.modules.maintenanceWork.service.IWorkBatchService;
 import org.jeecg.modules.maintenanceWork.vo.WorkBatchDetailVO;
+import org.jeecg.modules.maintenanceWork.vo.WorkBatchUserVO;
 import org.jeecg.modules.maintenanceWork.vo.WorkBatchVO;
 import org.jeecg.modules.unitDevice.dto.CaseReportWorkBatchDTO;
 import org.jeecg.modules.unitDevice.vo.CaseReportWorkBatchVO;
@@ -294,5 +295,10 @@ public class WorkBatchServiceImpl extends ServiceImpl<WorkBatchMapper, WorkBatch
         return this.baseMapper.getTodoList(currentUserId);
     }
 
+    @Override
+    public List<WorkBatchUserVO> listUser(String query) {
+        return this.baseMapper.listUser(query);
+    }
+
 
 }

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/vo/WorkBatchUserVO.java

+package org.jeecg.modules.maintenanceWork.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * <p>
+ * 维修作业管理-作业计划批次管理表
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-08-09
+ */
+@Data
+@ApiModel(value = "WorkBatchUserVO对象", description = "维修作业管理-派工用户")
+public class WorkBatchUserVO {
+    private static final long serialVersionUID = 1L;
+    private String id;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/system/controller/CommonController.java

@@ -261,7 +261,7 @@ public class CommonController {
             response.addHeader("Cache-Control", "no-cache");
             inputStream = classPathResource.getInputStream();
             outputStream = response.getOutputStream();
-            byte[] buf = new byte[4096];
+            byte[] buf = new byte[1024];
             int len;
             while ((len = inputStream.read(buf)) > 0) {
                 outputStream.write(buf, 0, len);

jeecg-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java

@@ -121,6 +121,14 @@ public class LoginController {
             return result;
         }
 
+        //1.5 正式员工只能走AO
+        Integer userIdentity = sysUser.getUserIdentity();
+        if (1 == userIdentity) {
+            result.error500("正式员工请从OA登录");
+            return result;
+        }
+
+
         //2. 校验用户名或密码是否正确
         String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt());
         String syspassword = sysUser.getPassword();
@@ -132,6 +140,7 @@ public class LoginController {
             return result;
         }
 
+
         //用户登录信息
         userInfo(sysUser, result);
         //update-begin--Author:liusq  Date:20210126  for：登录成功，删除redis中的验证码

jeecg-module-system/src/main/java/org/jeecg/modules/system/entity/SysUser.java

@@ -167,9 +167,9 @@ public class SysUser implements Serializable {
     private Integer activitiSync;
 
     /**
-     * 身份（0 普通成员 1 上级）
+     * 身份 1-正式 2-委外
      */
-    @Excel(name="（1普通成员 2上级）",width = 15)
+    @Excel(name="1-正式 2-委外",width = 15)
     private Integer userIdentity;
 
     /**

jeecg-module-system/src/main/resources/application-dev.yml

 server:
-  port: 8081
+  port: 17002
   tomcat:
     max-swallow-size: -1
   error:
@@ -99,7 +99,7 @@ spring:
   datasource:
     druid:
       stat-view-servlet:
-        enabled: true
+        enabled: false
         loginUsername: admin
         loginPassword: 123456
         allow:
@@ -131,13 +131,13 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://47.94.207.62:3306/hzgw_test?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&zeroDateTimeBehavior=convertToNull
+          url: jdbc:mysql://47.94.207.62:3306/hzgw_prod?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&zeroDateTimeBehavior=convertToNull
           username: root
           password: superAdmin&321
           driver-class-name: com.mysql.cj.jdbc.Driver
   #redis 配置
   redis:
-    database: 0
+    database: 9
     host: 47.94.207.62
     lettuce:
       pool:
@@ -161,7 +161,7 @@ mybatis-plus:
       table-underline: true
   configuration:
     # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     # 返回类型为Map,显示null对应的字段
     call-setters-on-nulls: true
     # 驼峰
@@ -187,7 +187,6 @@ jeecg:
     upload: F:\\upFiles
     #webapp文件路径
     webapp: F:\\upFiles
-    #文件访问域名
   shiro:
     excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
   #阿里云oss存储和大鱼短信秘钥配置
@@ -296,3 +295,11 @@ third-app:
       # appSecret
       client-secret: ??
       agent-id: ??
+
+
+# 统一身份证
+iam:
+  postUserInfoUrl: http://47.110.134.43:15105/common-uuv/login/user/temp-code
+  # 获取用户信息成功状态码
+  getUserInfoSucceed: ok
+  defaultRoleCode: gcs

jeecg-module-system/src/main/resources/application-prod.yml

@@ -99,9 +99,9 @@ spring:
   datasource:
     druid:
       stat-view-servlet:
-        enabled: true
-        loginUsername: admin
-        loginPassword: 123456
+        enabled: false
+        loginUsername: lkjxlkjslkfjl1dsaf
+        loginPassword: alqw1w55+1234jkdf1234
         allow:
       web-stat-filter:
         enabled: true
@@ -182,9 +182,9 @@ jeecg:
     app: http://localhost:8051
   path:
     #文件上传根目录 设置
-    upload: /opt/ztgk/prod/file
+    upload: /opt/etc/file
     #webapp文件路径
-    webapp: /opt/ztgk/prod/file
+    webapp: /opt/etc/file
   shiro:
     excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
   #阿里云oss存储和大鱼短信秘钥配置
@@ -241,6 +241,7 @@ jeecg:
 logging:
   level:
     org.jeecg.modules.system.mapper: info
+  register-shutdown-hook:
 #cas单点登录
 cas:
   prefixUrl: http://cas.example.org:8443/cas

jeecg-module-system/src/main/resources/application.yml

@@ -2,4 +2,4 @@ spring:
   application:
     name: hzgw
   profiles:
-    active: @package.environment@
+    active: dev

pom.xml

@@ -206,6 +206,11 @@
                 <artifactId>okhttp</artifactId>
                 <version>4.4.1</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.1.0</version>
+            </dependency>
             <!--minio-->
             <dependency>
                 <groupId>io.minio</groupId>