微调

lic-system/src/main/java/com/system/controller/LicInfoController.java

 package com.system.controller;
 
+import com.system.dao.LicInfoMapper;
 import com.system.serivce.ILicInfoService;
 import com.system.transfer.lic.*;
 import com.system.transfer.response.RestResponse;
+import com.system.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +22,8 @@ public class LicInfoController {
 
     @Autowired
     private ILicInfoService locInfoService;
-
+    @Autowired
+    private LicInfoMapper licInfoMapper;
 
     @ApiOperation("Lic信息列表")
     @GetMapping("/lic/info/list")
@@ -32,6 +35,10 @@ public class LicInfoController {
     @ApiOperation("Lic信息创建")
     @PostMapping("/lic/info/create")
     public RestResponse licInfoCreate(@RequestBody LicInfoCreateInVo inVo) {
+        LicInfoListOutVoRecords mac = licInfoMapper.getLicInfoByMacAddress(inVo.getMacAddress());
+        if (!StringUtil.isNull(mac)) {
+            return RestResponse.fail("MAC地址已存在");
+        }
         locInfoService.licInfoCreate(inVo);
         return RestResponse.success();
     }
@@ -39,6 +46,12 @@ public class LicInfoController {
     @ApiOperation("Lic信息更新")
     @PutMapping("/lic/info/update")
     public RestResponse licInfoUpdate(@RequestBody LicInfoUpdateInVo inVo) {
+        LicInfoListOutVoRecords mac = licInfoMapper.getLicInfoByMacAddress(inVo.getMacAddress());
+        if (!StringUtil.isNull(mac)) {
+            if (!mac.getId().equals(inVo.getId())) {
+                return RestResponse.fail("MAC地址已存在");
+            }
+        }
         locInfoService.licInfoUpdate(inVo);
         return RestResponse.success();
     }

lic-system/src/main/java/com/system/dao/LicInfoMapper.java

@@ -48,5 +48,11 @@ public interface LicInfoMapper {
      * @return Lic信息
      */
     LicInfoListOutVoRecords getLicInfoByMacAddress(String macAddress);
-
+    /**
+     * 根据id查询Lic信息
+     *
+     * @param macAddress MAC地址
+     * @return Lic信息
+     */
+    LicInfoListOutVoRecords getLicInfoById(Integer id);
 }

lic-system/src/main/java/com/system/dao/mapper/LicInfoMapper.xml

@@ -70,5 +70,14 @@
 
     </select>
 
+    <select id="getLicInfoById" parameterType="java.lang.Integer"
+            resultType="com.system.transfer.lic.LicInfoListOutVoRecords">
+
+        SELECT
+            id, lq_lic_name, mac_address, effective_time, file_effective_time, verification_interval, module_verification, create_time
+        FROM tb_lic_info WHERE id = #{id}
+
+    </select>
+
 
 </mapper>

lic-system/src/main/java/com/system/serivce/impl/LicInfoServiceImpl.java

@@ -59,7 +59,7 @@ public class LicInfoServiceImpl implements ILicInfoService {
 
     @Override
     public RestResponse licInfoFileCreate(LicInfoFileCreateInVo inVo, HttpServletResponse response) {
-        LicInfoListOutVoRecords records = licInfoMapper.getLicInfoByMacAddress(inVo.getMacAddress());
+        LicInfoListOutVoRecords records = licInfoMapper.getLicInfoById(inVo.getId());
         if (StringUtil.isNull(records)) {
             return RestResponse.fail("MAC地址不存在");
         }

lic-system/src/main/java/com/system/transfer/lic/LicInfoFileCreateInVo.java

@@ -10,7 +10,7 @@ import java.util.List;
  */
 @Data
 public class LicInfoFileCreateInVo {
-
+    private Integer id;
     /**
      * MAC地址
      */