对接修改

ktg-admin/src/main/java/com/ktg/web/controller/system/SysUserCharacteristicController.java

@@ -1,7 +1,5 @@
 package com.ktg.web.controller.system;
 
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ktg.common.annotation.Log;
@@ -9,6 +7,7 @@ import com.ktg.common.core.controller.BaseController;
 import com.ktg.common.enums.BusinessType;
 import com.ktg.common.pojo.CommonResult;
 import com.ktg.common.utils.poi.ExcelUtil;
+import com.ktg.framework.config.ServerConfig;
 import com.ktg.iscs.domain.IsSystemAttribute;
 import com.ktg.iscs.service.IIsSystemAttributeService;
 import com.ktg.system.domain.SysUserCharacteristic;
@@ -26,7 +25,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -45,6 +43,8 @@ public class SysUserCharacteristicController extends BaseController
     private ISysUserCharacteristicService sysUserCharacteristicService;
     @Autowired
     private IIsSystemAttributeService isSystemAttributeService;
+    @Autowired
+    private ServerConfig serverConfig;
 
     @ApiOperation("查询用户特征(指纹、面部)-分页")
     @Parameters({
@@ -55,7 +55,8 @@ public class SysUserCharacteristicController extends BaseController
     @GetMapping("/getSysUserCharacteristicPage")
     public CommonResult<Page<SysUserCharacteristic>> getSysUserCharacteristicPage(Page<SysUserCharacteristic> page, SysUserCharacteristic sysUserCharacteristic)
     {
-        Page<SysUserCharacteristic> result = sysUserCharacteristicService.getSysUserCharacteristicPage(page, sysUserCharacteristic);
+        String url = serverConfig.getUrl();
+        Page<SysUserCharacteristic> result = sysUserCharacteristicService.getSysUserCharacteristicPage(page, sysUserCharacteristic, url);
         return CommonResult.success(result);
     }
 
@@ -86,7 +87,7 @@ public class SysUserCharacteristicController extends BaseController
 
     @Transactional
     @ApiOperation("新增指纹录入-指纹图片转成dat存储")
-    @PreAuthorize("@ss.hasPermi('iscs:characteristic:add')")
+    // @PreAuthorize("@ss.hasPermi('iscs:characteristic:add')")
     @Log(title = "新增指纹录入-指纹图片转成dat存储", businessType = BusinessType.INSERT)
     @PostMapping("/insertUserFingerprintDat")
     public CommonResult<Boolean> insertUserFingerprintDat(MultipartFile file, String userName) throws IOException {
@@ -114,8 +115,6 @@ public class SysUserCharacteristicController extends BaseController
 	@PostMapping("/deleteSysUserCharacteristicByRecordIds")
     public CommonResult<Boolean> deleteSysUserCharacteristicByRecordIds(String recordIds)
     {
-        Assert.notBlank(recordIds, "请选择需要删除的数据!");
-        Long[] longIds = Convert.toLongArray(recordIds);
-        return CommonResult.success(sysUserCharacteristicService.removeBatchByIds(Arrays.asList(longIds)));
+        return CommonResult.success(sysUserCharacteristicService.deleteSysUserCharacteristicByRecordIds(recordIds));
     }
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/workarea/PointsMapVO.java

@@ -57,4 +57,25 @@ public class PointsMapVO implements Serializable {
     @ApiModelProperty(value = "区域地图")
     private String mapImg;
 
+    @ApiModelProperty(value = "x")
+    private String x;
+
+    @ApiModelProperty(value = "y")
+    private String y;
+
+    @ApiModelProperty(value = "entityId")
+    private Long entityId;
+
+    @ApiModelProperty(value = "entityName")
+    private String entityName;
+
+    @ApiModelProperty(value = "id")
+    private Long id;
+
+    @ApiModelProperty(value = "mapId")
+    private Long mapId;
+
+    @ApiModelProperty(value = "mapType")
+    private String mapType;
+
 }

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

@@ -153,7 +153,7 @@ public class IsJobCardServiceImpl extends ServiceImpl<IsJobCardMapper, IsJobCard
         IsJobCard isJobCard = isJobCardMapper.selectByUserId(user.getUserId());
         Assert.notNull(isJobCard, "用户未绑定卡!");
 
-        List<SysRole> roleList = iSysRoleService.selectRolesByUserId(user.getUserId());
+        List<SysRole> roleList = iSysRoleService.getRolesByUserId(user.getUserId());
 
         IsJobCardInfoRespVO respVO = BeanUtils.toBean(isJobCard, IsJobCardInfoRespVO.class);
         respVO.roleKeyList = roleList.stream().map(SysRole::getRoleKey).collect(Collectors.toList());

ktg-system/src/main/java/com/ktg/system/domain/SysUserCharacteristic.java

@@ -28,8 +28,8 @@ public class SysUserCharacteristic extends BaseBean
     @Excel(name = "用户id")
     private Long userId;
 
-    @ApiModelProperty(value = "类型(0-指纹图片 1-指纹特征值dat 2-面部图片 3-面部特征值 4-面部视频)")
-    @Excel(name = "类型(0-指纹图片 1-指纹特征值 2-面部图片 3-面部特征值 4-面部视频)")
+    @ApiModelProperty(value = "类型(1-指纹图片 2-面部图片)")
+    @Excel(name = "类型(1-指纹图片 2-面部图片)")
     private String type;
 
     @ApiModelProperty(value = "内容")

ktg-system/src/main/java/com/ktg/system/service/ISysRoleService.java

@@ -172,4 +172,6 @@ public interface ISysRoleService extends IService<SysRole>
      * @return 结果
      */
     public int insertAuthUsers(Long roleId, Long[] userIds);
+
+    List<SysRole> getRolesByUserId(Long userId);
 }

ktg-system/src/main/java/com/ktg/system/service/ISysUserCharacteristicService.java

@@ -16,8 +16,10 @@ import java.io.IOException;
  */
 public interface ISysUserCharacteristicService extends IService<SysUserCharacteristic> {
 
-    Page<SysUserCharacteristic> getSysUserCharacteristicPage(Page<SysUserCharacteristic> page, SysUserCharacteristic sysUserCharacteristic);
+    Page<SysUserCharacteristic> getSysUserCharacteristicPage(Page<SysUserCharacteristic> page, SysUserCharacteristic sysUserCharacteristic, String url);
 
     Boolean insertUserFingerprintDat(MultipartFile file, String userName, String sysAttrValue) throws IOException;
 
+    Boolean deleteSysUserCharacteristicByRecordIds(String recordIds);
+
 }

ktg-system/src/main/java/com/ktg/system/service/impl/SysRoleServiceImpl.java

@@ -403,4 +403,10 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         }
         return userRoleMapper.batchUserRole(list);
     }
+
+    @Override
+    public List<SysRole> getRolesByUserId(Long userId) {
+        List<SysRole> userRoles = roleMapper.selectRolePermissionByUserId(userId);
+        return userRoles;
+    }
 }

ktg-system/src/main/java/com/ktg/system/service/impl/SysUserCharacteristicServiceImpl.java

@@ -1,9 +1,11 @@
 package com.ktg.system.service.impl;
 
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ktg.common.config.RuoYiConfig;
 import com.ktg.common.core.domain.entity.SysUser;
 import com.ktg.common.utils.StringUtils;
 import com.ktg.system.domain.SysUserCharacteristic;
@@ -16,10 +18,13 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * 用户特征(指纹、面部)Service业务层处理
@@ -38,9 +43,22 @@ public class SysUserCharacteristicServiceImpl extends ServiceImpl<SysUserCharact
     private ISysUserService iSysUserService;
 
     @Override
-    public Page<SysUserCharacteristic> getSysUserCharacteristicPage(Page<SysUserCharacteristic> page, SysUserCharacteristic sysUserCharacteristic) {
+    public Page<SysUserCharacteristic> getSysUserCharacteristicPage(Page<SysUserCharacteristic> page, SysUserCharacteristic sysUserCharacteristic, String url) {
         Page<SysUserCharacteristic> result = page(page, Wrappers.<SysUserCharacteristic>lambdaQuery()
+                .eq(sysUserCharacteristic.getUserId() != null, SysUserCharacteristic::getUserId, sysUserCharacteristic.getUserId())
+                .eq(StringUtils.isNotBlank(sysUserCharacteristic.getType()), SysUserCharacteristic::getType, sysUserCharacteristic.getType())
                 .orderByDesc(SysUserCharacteristic::getRecordId));
+        String profile = RuoYiConfig.getProfile();
+        for (SysUserCharacteristic record : result.getRecords()) {
+            if (StringUtils.isNotBlank(record.getImageUrl())) {
+                if (record.getImageUrl().contains("C:" + profile)) {
+                    record.setImageUrl(record.getImageUrl().replace("C:" + profile, url + "/profile"));
+                }
+                if (record.getImageUrl().contains(profile)) {
+                    record.setImageUrl(record.getImageUrl().replace(profile, url + "/profile"));
+                }
+            }
+        }
         return result;
     }
 
@@ -63,7 +81,7 @@ public class SysUserCharacteristicServiceImpl extends ServiceImpl<SysUserCharact
         // 时间戳
         long currentTimestamp = System.currentTimeMillis();
         // 设置文件路径
-        String filePath = "/home/iscs/finger/" + userId +"/";
+        String filePath = RuoYiConfig.getProfile() + "/finger/" + userId +"/";
         if (StringUtils.isBlank(prodApi)) {
             filePath = "C:" + filePath;
         }
@@ -114,4 +132,25 @@ public class SysUserCharacteristicServiceImpl extends ServiceImpl<SysUserCharact
         return template.serialize().getBytes();
     }
 
+    @Override
+    public Boolean deleteSysUserCharacteristicByRecordIds(String recordIds) {
+        Assert.notBlank(recordIds, "请选择需要删除的数据!");
+        Long[] longIds = Convert.toLongArray(recordIds);
+        List<Long> list = Arrays.asList(longIds);
+        List<SysUserCharacteristic> sysUserCharacteristics = listByIds(list);
+        for (SysUserCharacteristic sysUserCharacteristic : sysUserCharacteristics) {
+            if (StringUtils.isNotBlank(sysUserCharacteristic.getContent())) {
+                File file = new File(sysUserCharacteristic.getContent());
+                if (!file.delete()) {
+                    log.error("DAT文件删除失败: " + sysUserCharacteristic.getContent());
+                }
+                File file1 = new File(sysUserCharacteristic.getImageUrl());
+                if (!file1.delete()) {
+                    log.error("img文件删除失败: " + sysUserCharacteristic.getImageUrl());
+                }
+            }
+        }
+        return removeBatchByIds(list);
+    }
+
 }