Merge remote-tracking branch 'origin/master'

src/main/java/cn/ezhizao/framework/security/filter/JwtAuthenticationTokenFilter.java

@@ -23,18 +23,14 @@ import java.io.IOException;
  * @author ruoyi
  */
 @Component
-public class JwtAuthenticationTokenFilter extends OncePerRequestFilter
-{
+public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
     @Resource
     private TokenService tokenService;
 
     @Override
-    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
-            throws ServletException, IOException
-    {
+    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws ServletException, IOException {
         LoginUser loginUser = tokenService.getLoginUser(request);
-        if (StringUtils.isNotNull(loginUser) && StringUtils.isNull(SecurityUtils.getAuthentication()))
-        {
+        if (StringUtils.isNotNull(loginUser) && StringUtils.isNull(SecurityUtils.getAuthentication())) {
             tokenService.verifyToken(loginUser);
             UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(loginUser, null, loginUser.getAuthorities());
             authenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));

src/main/java/cn/ezhizao/project/business/domain/BizEquipmentDetail.java

@@ -49,7 +49,7 @@ public class BizEquipmentDetail extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "报废日期", width = 30, dateFormat = "yyyy-MM-dd")
     @ApiModelProperty(value = "报废日期")
-    private Date scrappingDate;
+    private Date abandonmentDate;
 
 
     /** 设备状态id（对应数据字典id） */

src/main/resources/application-dev.yml

@@ -33,13 +33,13 @@ spring:
                 username: root
                 password: ezhizao.cn123456
             # 从库数据源
-            slave:
-                driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
-                # 从数据源开关/默认关闭
-                enabled: true
-                url: jdbc:sqlserver://localhost:1433;DatabaseName=p240_dianzi_xz
-                username: sa
-                password: sa12345678
+#            slave:
+#                driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+#                # 从数据源开关/默认关闭
+#                enabled: true
+#                url: jdbc:sqlserver://localhost:1433;DatabaseName=p240_dianzi_xz
+#                username: sa
+#                password: sa12345678
             # 初始连接数
             initialSize: 5
             # 最小连接池数量

src/main/resources/application.yml

@@ -51,7 +51,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 120.46.159.163:8848 # Nacos服务器地址
+        server-addr: 120.46.159.163:7148 # Nacos服务器地址
         namespace: ezhizao_dms # 命名空间
         #config:
         #server-addr: 114.116.195.82:8848 # Nacos服务器地址

src/main/resources/mybatis/business/BizResourceAllocationMapper.xml

@@ -11,7 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <select id="getList" parameterType="BizResourceAllocation" resultMap="BizResourceAllocationResult">
-        SELECT l.*,p.process_code,p.process_alias,e.equipment_code,e.usage_dept_code,e.scrapping_date,e.equipment_status_code
+        SELECT l.*,p.process_code,p.process_alias,e.equipment_code,e.usage_dept_code,e.abandonment_date,e.equipment_status_code
         FROM biz_resource_allocation l  LEFT JOIN biz_process p ON l.process_id = p.id LEFT JOIN biz_equipment_detail e ON l.equipment_id = e.id
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             l.deleted = 0

src/main/resources/mybatis/business/BizTechnologicalProcessDetailMapper.xml

@@ -31,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             deleted = 0
             <if test="technologicalProcessId!= null"> AND technological_process_id = #{technologicalProcessId}</if>
         </trim>
+        order by process_step_number
     </select>
 
     <delete id="physicalDelete">