对接修改

ktg-admin/src/main/java/com/ktg/web/controller/common/CommonController.java

@@ -9,6 +9,8 @@ import com.ktg.common.utils.file.FileUtils;
 import com.ktg.framework.config.ServerConfig;
 import com.ktg.system.domain.SysUploadFile;
 import com.ktg.system.service.ISysUploadFileService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +31,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
+@Api(tags = "通用请求处理-文件")
 @RestController
 @RequestMapping("/common")
 public class CommonController {
@@ -47,6 +50,7 @@ public class CommonController {
      * @param fileName 文件名称
      * @param delete   是否删除
      */
+    @ApiOperation("通用下载请求")
     @GetMapping("/download")
     public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request) {
         try {
@@ -70,6 +74,7 @@ public class CommonController {
     /**
      * 通用上传请求（单个）
      */
+    @ApiOperation("通用上传请求（单个）")
     @PostMapping("/upload")
     public AjaxResult uploadFile(MultipartFile file) throws Exception {
         try {
@@ -101,6 +106,7 @@ public class CommonController {
     /**
      * 通用上传请求（多个）
      */
+    @ApiOperation("通用上传请求（多个）")
     @PostMapping("/uploads")
     public AjaxResult uploadFiles(List<MultipartFile> files) throws Exception {
         try {
@@ -141,6 +147,7 @@ public class CommonController {
     /**
      * 本地资源通用下载
      */
+    @ApiOperation("本地资源通用下载")
     @GetMapping("/download/resource")
     public void resourceDownload(String resource, HttpServletRequest request, HttpServletResponse response)
             throws Exception {
@@ -162,6 +169,7 @@ public class CommonController {
         }
     }
 
+    @ApiOperation("monio上传")
     @PostMapping("/uploadMinio")
     public AjaxResult uploadFileMinio(MultipartFile file) throws Exception {
         try {

ktg-admin/src/main/resources/application.yml

@@ -60,7 +60,7 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: localhost
+    host: 36.133.174.236
     # 端口，默认为6379
     port: 6379
     # 数据库索引
@@ -87,7 +87,7 @@ token:
     # 令牌密钥
     secret: abcdefghijklmnopqrstuvwxyz
     # 令牌有效期（默认30分钟）
-    expireTime: 30
+    expireTime: 120
 
 # MyBatis配置
 #mybatis:

ktg-framework/src/main/java/com/ktg/framework/security/handle/LogoutSuccessHandlerImpl.java

@@ -1,23 +1,21 @@
 package com.ktg.framework.security.handle;
 
-import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
 import com.alibaba.fastjson.JSON;
-import com.ktg.common.constant.Constants;
 import com.ktg.common.constant.HttpStatus;
 import com.ktg.common.core.domain.AjaxResult;
 import com.ktg.common.core.domain.model.LoginUser;
 import com.ktg.common.utils.ServletUtils;
 import com.ktg.common.utils.StringUtils;
-import com.ktg.framework.manager.AsyncManager;
-import com.ktg.framework.manager.factory.AsyncFactory;
 import com.ktg.framework.web.service.TokenService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 
 /**
  * 自定义退出处理类 返回成功
@@ -44,9 +42,10 @@ public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler
         {
             String userName = loginUser.getUsername();
             // 删除用户缓存记录
+            System.out.println("退出--------"+loginUser.getToken());
             tokenService.delLoginUser(loginUser.getToken());
             // 记录用户退出日志
-            AsyncManager.me().execute(AsyncFactory.recordLogininfor(userName, Constants.LOGOUT, "退出成功"));
+            // AsyncManager.me().execute(AsyncFactory.recordLogininfor(userName, Constants.LOGOUT, "退出成功"));
         }
         ServletUtils.renderString(response, JSON.toJSONString(AjaxResult.error(HttpStatus.SUCCESS, "退出成功")));
     }

ktg-framework/src/main/java/com/ktg/framework/web/service/TokenService.java

@@ -1,12 +1,5 @@
 package com.ktg.framework.web.service;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import javax.servlet.http.HttpServletRequest;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
 import com.ktg.common.constant.Constants;
 import com.ktg.common.core.domain.model.LoginUser;
 import com.ktg.common.core.redis.RedisCache;
@@ -19,6 +12,14 @@ import eu.bitwalker.useragentutils.UserAgent;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 /**
  * token验证处理
@@ -127,10 +128,9 @@ public class TokenService
     {
         long expireTime = loginUser.getExpireTime();
         long currentTime = System.currentTimeMillis();
-        if (expireTime - currentTime <= MILLIS_MINUTE_TEN)
-        {
-            refreshToken(loginUser);
-        }
+        // if (expireTime - currentTime <= MILLIS_MINUTE_TEN) {
+        refreshToken(loginUser);
+        // }
     }
 
     /**

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsIsolationPointController.java

@@ -43,7 +43,7 @@ public class IsIsolationPointController extends BaseController {
             @Parameter(name = "page", description = "Page"),
             @Parameter(name = "dto", description = "实体参数")
     })
-    @PreAuthorize("@ss.hasPermi('iscs:point:page')")
+    @PreAuthorize("@ss.hasPermi('mes:md:seg:query')")
     @GetMapping("/getIsIsolationPointPage")
     public CommonResult<Page<IsIsolationPoint>> getIsIsolationPointPage(Page<IsIsolationPoint> page, PagePointDTO dto) {
         Page<IsIsolationPoint> result = isIsolationPointService.page(page, Wrappers.<IsIsolationPoint>lambdaQuery()
@@ -63,7 +63,7 @@ public class IsIsolationPointController extends BaseController {
             @Parameter(name = "workshopId", description = "所属车间ID"),
             @Parameter(name = "workareaId", description = "所属区域ID")
     })
-    @PreAuthorize("@ss.hasPermi('iscs:point:list')")
+    // @PreAuthorize("@ss.hasPermi('iscs:point:list')")
     @GetMapping("/getIsIsolationPointList")
     public CommonResult<List<IsIsolationPoint>> getIsIsolationPointList(Long workshopId, Long workareaId) {
         List<IsIsolationPoint> result = isIsolationPointService.list(Wrappers.<IsIsolationPoint>lambdaQuery()
@@ -92,7 +92,7 @@ public class IsIsolationPointController extends BaseController {
      */
     @ApiOperation("获取隔离点详细信息")
     @Parameter(name = "pointId", description = "pointId")
-    @PreAuthorize("@ss.hasPermi('iscs:point:query')")
+    // @PreAuthorize("@ss.hasPermi('iscs:point:query')")
     @GetMapping(value = "/selectIsIsolationPointById")
     public CommonResult<IsIsolationPoint> selectIsIsolationPointById(Long pointId) {
         return CommonResult.success(isIsolationPointService.selectIsIsolationPointByPointId(pointId));
@@ -102,7 +102,7 @@ public class IsIsolationPointController extends BaseController {
      * 新增隔离点
      */
     @ApiOperation("新增隔离点")
-    @PreAuthorize("@ss.hasPermi('iscs:point:add')")
+    @PreAuthorize("@ss.hasPermi('mes:md:seg:add')")
     @Log(title = "隔离点", businessType = BusinessType.INSERT)
     @PostMapping("/insertIsIsolationPoint")
     public CommonResult<Boolean> insertIsIsolationPoint(@RequestBody @Parameter(name = "isIsolationPoint", description = "新增数据类,放到body") IsIsolationPoint isIsolationPoint) {
@@ -113,7 +113,7 @@ public class IsIsolationPointController extends BaseController {
      * 修改隔离点
      */
     @ApiOperation("修改隔离点")
-    @PreAuthorize("@ss.hasPermi('iscs:point:edit')")
+    @PreAuthorize("@ss.hasPermi('mes:md:seg:edit')")
     @Log(title = "隔离点", businessType = BusinessType.UPDATE)
     @PostMapping("/updateIsIsolationPoint")
     public CommonResult<Boolean> updateIsIsolationPoint(@RequestBody @Parameter(name = "isIsolationPoint", description = "修改数据类,放到body") IsIsolationPoint isIsolationPoint) {
@@ -124,7 +124,7 @@ public class IsIsolationPointController extends BaseController {
      * 删除隔离点
      */
     @ApiOperation("删除隔离点")
-    @PreAuthorize("@ss.hasPermi('iscs:point:remove')")
+    // @PreAuthorize("@ss.hasPermi('iscs:point:remove')")
     @Log(title = "隔离点", businessType = BusinessType.DELETE)
     @PostMapping("/deleteIsIsolationPointByPointIds")
     public CommonResult<Boolean> deleteIsIsolationPointByPointIds(String pointIds) {

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsJobTicketController.java

@@ -45,7 +45,7 @@ public class IsJobTicketController extends BaseController
             @Parameter(name = "page", description = "Page"),
             @Parameter(name = "dto", description = "实体参数")
     })
-    @PreAuthorize("@ss.hasPermi('iscs:ticket:list')")
+    @PreAuthorize("@ss.hasPermi('mes:job:jobm:query')")
     @GetMapping("/getIsJobTicketPage")
     public CommonResult<Page<PageTicketVO>> getIsJobTicketPage(Page<IsJobTicket> page, PageTicketDTO dto)
     {
@@ -72,7 +72,7 @@ public class IsJobTicketController extends BaseController
      */
     @ApiOperation("获取作业票详细信息")
     @Parameter(name = "ticketId", description = "ticketId")
-    @PreAuthorize("@ss.hasPermi('iscs:ticket:query')")
+    // @PreAuthorize("@ss.hasPermi('iscs:ticket:query')")
     @GetMapping(value = "/selectIsJobTicketById")
     public CommonResult<JobTicketDetailVO> selectIsJobTicketById(Long ticketId)
     {
@@ -83,7 +83,7 @@ public class IsJobTicketController extends BaseController
      * 新增作业票
      */
     @ApiOperation("新增作业票")
-    @PreAuthorize("@ss.hasPermi('iscs:ticket:add')")
+    @PreAuthorize("@ss.hasPermi('mes:job:jobm:add')")
     @Log(title = "作业票", businessType = BusinessType.INSERT)
     @PostMapping("/insertIsJobTicket")
     public CommonResult<Boolean> insertIsJobTicket(@RequestBody @Parameter(name = "dto", description = "新增数据类,放到body") AddJobTicketDTO dto)
@@ -95,7 +95,7 @@ public class IsJobTicketController extends BaseController
      * 修改作业票
      */
     @ApiOperation("修改作业票")
-    @PreAuthorize("@ss.hasPermi('iscs:ticket:edit')")
+    @PreAuthorize("@ss.hasPermi('mes:job:jobm:edit')")
     @Log(title = "作业票", businessType = BusinessType.UPDATE)
     @PostMapping("/updateIsJobTicket")
     public CommonResult<Boolean> updateIsJobTicket(@RequestBody @Parameter(name = "dto", description = "修改数据类,放到body") AddJobTicketDTO dto)
@@ -107,7 +107,7 @@ public class IsJobTicketController extends BaseController
      * 删除作业票
      */
     @ApiOperation("删除作业票")
-    @PreAuthorize("@ss.hasPermi('iscs:ticket:remove')")
+    // @PreAuthorize("@ss.hasPermi('iscs:ticket:remove')")
     @Log(title = "作业票", businessType = BusinessType.DELETE)
 	@PostMapping("/deleteIsJobTicketByTicketIds")
     public CommonResult<Boolean> deleteIsJobTicketByTicketIds(String ticketIds)

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsSopController.java

@@ -44,7 +44,7 @@ public class IsSopController extends BaseController {
             @Parameter(name = "page", description = "Page"),
             @Parameter(name = "dto", description = "实体参数")
     })
-    @PreAuthorize("@ss.hasPermi('iscs:sop:list')")
+    @PreAuthorize("@ss.hasPermi('mes:sop:sopm:query')")
     @GetMapping("/getIsSopPage")
     public CommonResult<Page<SopPageVO>> getIsSopPage(Page<IsSop> page, PageSopDTO dto) {
         return CommonResult.success(isSopService.getIsSopPage(page, dto));
@@ -69,7 +69,7 @@ public class IsSopController extends BaseController {
      */
     @ApiOperation("获取SOP信息详细信息")
     @Parameter(name = "sopId", description = "sopId")
-    @PreAuthorize("@ss.hasPermi('iscs:sop:query')")
+    // @PreAuthorize("@ss.hasPermi('iscs:sop:query')")
     @GetMapping(value = "/selectIsSopById")
     public CommonResult<SopDetailVO> selectIsSopById(Long sopId) {
         return CommonResult.success(isSopService.selectIsSopBySopId(sopId));
@@ -79,7 +79,7 @@ public class IsSopController extends BaseController {
      * 新增SOP信息
      */
     @ApiOperation("新增SOP信息")
-    @PreAuthorize("@ss.hasPermi('iscs:sop:add')")
+    @PreAuthorize("@ss.hasPermi('mes:sop:sopm:add')")
     @Log(title = "SOP信息", businessType = BusinessType.INSERT)
     @PostMapping("/insertIsSop")
     public CommonResult<Boolean> insertIsSop(@RequestBody @Parameter(name = "dto", description = "新增数据类,放到body") AddSopDTO dto) {
@@ -90,7 +90,7 @@ public class IsSopController extends BaseController {
      * 修改SOP信息
      */
     @ApiOperation("修改SOP信息")
-    @PreAuthorize("@ss.hasPermi('iscs:sop:edit')")
+    @PreAuthorize("@ss.hasPermi('mes:sop:sopm:edit')")
     @Log(title = "SOP信息", businessType = BusinessType.UPDATE)
     @PostMapping("/updateIsSop")
     public CommonResult<Boolean> updateIsSop(@RequestBody @Parameter(name = "dto", description = "修改数据类,放到body") AddSopDTO dto) {
@@ -101,7 +101,7 @@ public class IsSopController extends BaseController {
      * 删除SOP信息
      */
     @ApiOperation("删除SOP信息")
-    @PreAuthorize("@ss.hasPermi('iscs:sop:remove')")
+    // @PreAuthorize("@ss.hasPermi('iscs:sop:remove')")
     @Log(title = "SOP信息", businessType = BusinessType.DELETE)
     @PostMapping("/deleteIsSopBySopIds")
     public CommonResult<Boolean> deleteIsSopBySopIds(String sopIds) {

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsWorkareaController.java

@@ -42,7 +42,7 @@ public class IsWorkareaController extends BaseController {
             @Parameter(name = "page", description = "Page"),
             @Parameter(name = "dto", description = "实体参数")
     })
-    @PreAuthorize("@ss.hasPermi('iscs:workarea:page')")
+    @PreAuthorize("@ss.hasPermi('mes:md:waa:query')")
     @GetMapping("/getIsWorkareaPage")
     public CommonResult<Page<PageWorkareaVO>> getIsWorkareaPage(Page page, IsWorkarea dto) {
         return CommonResult.success(isWorkareaService.getIsWorkareaPage(page, dto));
@@ -52,7 +52,7 @@ public class IsWorkareaController extends BaseController {
     @Parameters({
             @Parameter(name = "workshopId", description = "所属车间ID")
     })
-    @PreAuthorize("@ss.hasPermi('iscs:workarea:list')")
+    // @PreAuthorize("@ss.hasPermi('iscs:workarea:list')")
     @GetMapping("/getIsWorkareaList")
     public CommonResult<List<IsWorkarea>> getIsWorkareaList(Long workshopId) {
         List<IsWorkarea> result = isWorkareaService.list(Wrappers.<IsWorkarea>lambdaQuery()
@@ -101,7 +101,7 @@ public class IsWorkareaController extends BaseController {
      * 修改工作区域
      */
     @ApiOperation("修改工作区域")
-    @PreAuthorize("@ss.hasPermi('iscs:workarea:edit')")
+    @PreAuthorize("@ss.hasPermi('mes:md:waa:edit')")
     @Log(title = "工作区域", businessType = BusinessType.UPDATE)
     @PostMapping("/updateIsWorkarea")
     public CommonResult<Boolean> updateIsWorkarea(@RequestBody @Parameter(name = "isWorkarea", description = "修改数据类,放到body") IsWorkarea isWorkarea) {
@@ -112,7 +112,7 @@ public class IsWorkareaController extends BaseController {
      * 删除工作区域
      */
     @ApiOperation("删除工作区域")
-    @PreAuthorize("@ss.hasPermi('iscs:workarea:remove')")
+    // @PreAuthorize("@ss.hasPermi('mes:md:waa:batchremove')")
     @Log(title = "工作区域", businessType = BusinessType.DELETE)
     @PostMapping("/deleteIsWorkareaByWorkareaIds")
     public CommonResult<Boolean> deleteIsWorkareaByWorkareaIds(String workareaIds) {

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/points/PointDetailVO.java

@@ -29,6 +29,9 @@ public class PointDetailVO extends BaseBean
     @ApiModelProperty(value = "隔离点类型")
     private String pointType;
 
+    @ApiModelProperty(value = "隔离点类型Name")
+    private String pointTypeName;
+
     @ApiModelProperty(value = "所属车间ID")
     private Long workshopId;
 
@@ -38,6 +41,9 @@ public class PointDetailVO extends BaseBean
     @ApiModelProperty(value = "危险能量类型")
     private String powerType;
 
+    @ApiModelProperty(value = "危险能量类型Name")
+    private String powerTypeName;
+
     @ApiModelProperty(value = "隔离方式")
     private String isolationMethod;
 

ktg-iscs/src/main/java/com/ktg/iscs/mapper/IsIsolationPointMapper.java

@@ -2,7 +2,9 @@ package com.ktg.iscs.mapper;
 
 import com.ktg.common.mapper.BaseMapperX;
 import com.ktg.iscs.domain.IsIsolationPoint;
+import com.ktg.iscs.domain.vo.points.PointDetailVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -62,4 +64,6 @@ public interface IsIsolationPointMapper extends BaseMapperX<IsIsolationPoint>
      * @return 结果
      */
     int deleteIsIsolationPointByPointIds(Long[] pointIds);
+
+    List<PointDetailVO> getPointDetailList(@Param(value = "pointIds") List<Long> pointIds);
 }

ktg-iscs/src/main/java/com/ktg/iscs/service/IIsIsolationPointService.java

@@ -62,5 +62,7 @@ public interface IIsIsolationPointService extends IService<IsIsolationPoint>
      */
     int deleteIsIsolationPointByPointId(Long pointId);
 
-    List<PointDetailVO> getPointDetailList(Long[] ids);
+    List<PointDetailVO> getPointDetailList(List<Long> pointIds);
+
+
 }

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsIsolationPointServiceImpl.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ktg.common.core.text.Convert;
 import com.ktg.common.utils.DateUtils;
-import com.ktg.common.utils.bean.BeanUtils;
 import com.ktg.iscs.domain.IsIsolationPoint;
 import com.ktg.iscs.domain.vo.points.PointDetailVO;
 import com.ktg.iscs.mapper.IsIsolationPointMapper;
@@ -14,7 +13,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -123,9 +121,9 @@ public class IsIsolationPointServiceImpl extends ServiceImpl<IsIsolationPointMap
     }
 
     @Override
-    public List<PointDetailVO> getPointDetailList(Long[] ids) {
-        Assert.isTrue(ids.length == 0, "查询隔离点信息出错！");
-        List<IsIsolationPoint> isIsolationPoints = listByIds(Arrays.asList(ids));
-        return BeanUtils.toBean(isIsolationPoints, PointDetailVO.class);
+    public List<PointDetailVO> getPointDetailList(List<Long> pointIds) {
+        Assert.isTrue(!pointIds.isEmpty(), "查询隔离点信息出错！");
+        List<PointDetailVO> isIsolationPoints = isIsolationPointMapper.getPointDetailList(pointIds);
+        return isIsolationPoints;
     }
 }

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsSopServiceImpl.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ktg.common.core.text.Convert;
 import com.ktg.common.utils.bean.BeanUtils;
-import com.ktg.iscs.domain.IsIsolationPoint;
 import com.ktg.iscs.domain.IsSop;
 import com.ktg.iscs.domain.IsSopPoints;
 import com.ktg.iscs.domain.dto.sop.AddSopDTO;
@@ -59,8 +58,8 @@ public class IsSopServiceImpl extends ServiceImpl<IsSopMapper, IsSop> implements
         // 3.查询隔离点数据
         if (!isSopPoints.isEmpty()) {
             List<Long> pointIds = isSopPoints.stream().map(IsSopPoints::getPointId).collect(Collectors.toList());
-            List<IsIsolationPoint> isIsolationPoints = iIsIsolationPointService.listByIds(pointIds);
-            List<PointDetailVO> pointDetailVOList = BeanUtils.toBean(isIsolationPoints, PointDetailVO.class);
+            // List<IsIsolationPoint> isIsolationPoints = iIsIsolationPointService.listByIds(pointIds);
+            List<PointDetailVO> pointDetailVOList = iIsIsolationPointService.getPointDetailList(pointIds);
             // 3.1组合返回数据
             sopDetailVO.setPointDetailVOList(pointDetailVOList);
         }

ktg-iscs/src/main/resources/mapper/IsIsolationPointMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ktg.iscs.mapper.IsIsolationPointMapper">
-    
+
     <resultMap type="IsIsolationPoint" id="IsIsolationPointResult">
         <result property="pointId"    column="point_id"    />
         <result property="pointCode"    column="point_code"    />
@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectIsIsolationPointList" parameterType="IsIsolationPoint" resultMap="IsIsolationPointResult">
         <include refid="selectIsIsolationPointVo"/>
-        <where>  
+        <where>
             <if test="pointCode != null  and pointCode != ''"> and point_code = #{pointCode}</if>
             <if test="pointName != null  and pointName != ''"> and point_name like concat('%', #{pointName}, '%')</if>
             <if test="pointType != null  and pointType != ''"> and point_type = #{pointType}</if>
@@ -40,12 +40,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="pointPicture != null  and pointPicture != ''"> and point_picture = #{pointPicture}</if>
         </where>
     </select>
-    
+
     <select id="selectIsIsolationPointByPointId" parameterType="Long" resultMap="IsIsolationPointResult">
         <include refid="selectIsIsolationPointVo"/>
         where point_id = #{pointId}
     </select>
-        
+
     <insert id="insertIsIsolationPoint" parameterType="IsIsolationPoint" useGeneratedKeys="true" keyProperty="pointId">
         insert into is_isolation_point
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -108,9 +108,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteIsIsolationPointByPointIds" parameterType="String">
-        delete from is_isolation_point where point_id in 
+        delete from is_isolation_point where point_id in
         <foreach item="pointId" collection="array" open="(" separator="," close=")">
             #{pointId}
         </foreach>
     </delete>
-</mapper>
+
+    <select id="getPointDetailList" resultType="com.ktg.iscs.domain.vo.points.PointDetailVO">
+        select p.*,
+               d.dict_label as powerTypeName,
+               dd.dict_label as pointTypeName
+        from is_isolation_point p
+        left join sys_dict_data d on d.dict_type = 'power_type' and p.power_type = d.dict_value
+        left join sys_dict_data dd on dd.dict_type = 'point_type' and p.point_type = dd.dict_value
+        <where>
+            p.point_id in
+            <foreach collection="pointIds" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+</mapper>

ktg-mes/src/main/resources/mapper/md/MdWorkshopMapper.xml

@@ -35,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="charge != null  and charge != ''"> and charge = #{charge}</if>
             <if test="enableFlag != null  and enableFlag != ''"> and enable_flag = #{enableFlag}</if>
         </where>
+        order by workshop_id desc
     </select>
 
     <select id="selectMdWorkshopByWorkshopId" parameterType="Long" resultMap="MdWorkshopResult">