Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysUser.java

@@ -126,7 +126,8 @@ public class SysUser extends BaseEntity {
     /**
      * 登录时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+//    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "登录时间")
     private Date lastTime;
 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysPhysicalDefenseConstructionController.java

@@ -1,5 +1,6 @@
 package com.xunmei.system.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -62,7 +63,11 @@ public class SysPhysicalDefenseConstructionController extends BaseController {
     //@RequiresPermissions("system:construction:add")
     @Log(title = "机构物防建设", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody SysPhysicalDefenseConstruction sysPhysicalDefenseConstruction) {
+    public AjaxResult add(@RequestBody SysPhysicalDefenseConstruction sysPhysicalDefenseConstruction) throws Exception{
+        long count = sysPhysicalDefenseConstructionService.count(new LambdaQueryWrapper<SysPhysicalDefenseConstruction>().eq(SysPhysicalDefenseConstruction::getOrgId, sysPhysicalDefenseConstruction.getOrgId()).eq(SysPhysicalDefenseConstruction::getType, sysPhysicalDefenseConstruction.getType()).eq(SysPhysicalDefenseConstruction::getStandard, sysPhysicalDefenseConstruction.getStandard()));
+        if (count > 0) {
+            throw new RuntimeException("当前标准已存在");
+        }
         return toAjax(sysPhysicalDefenseConstructionService.insertSysPhysicalDefenseConstruction(sysPhysicalDefenseConstruction));
     }
 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysUserController.java

@@ -7,11 +7,8 @@ import com.alibaba.excel.event.AnalysisEventListener;
 import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.R;
 import com.xunmei.common.core.domain.message.domain.CoreAnnouncementNotificationToRole;
-import com.xunmei.common.core.domain.retrieval.vo.CoreMonitoringRetrievalTaskExcelVo;
-import com.xunmei.common.core.utils.DateHelper;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.utils.StringUtils;
 import com.xunmei.common.core.vo.IdNameVo;
@@ -46,6 +43,7 @@ import java.io.File;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 /**
@@ -487,10 +485,13 @@ public class SysUserController extends BaseController {
         if (ObjectUtil.isEmpty(list)) {
             throw new RuntimeException("导出数据为空!");
         }
+        AtomicInteger xh= new AtomicInteger();
+        xh.getAndIncrement();
         list.forEach(e->{
             if (e.getIsManager()==null) {
                 e.setIsManager("N");
             }
+            e.setXh(String.valueOf(xh.getAndIncrement()));
         });
 
         if(list.size()>10000){
@@ -523,6 +524,16 @@ public class SysUserController extends BaseController {
             throw new RuntimeException("导出数据为空!");
         }
         list = list.stream().filter(e -> "Y".equals(e.getIsManager())).collect(Collectors.toList());
+
+        AtomicInteger xh= new AtomicInteger();
+        xh.getAndIncrement();
+        list.forEach(e->{
+            if (e.getIsManager()==null) {
+                e.setIsManager("N");
+            }
+            e.setXh(String.valueOf(xh.getAndIncrement()));
+        });
+
         if (list.size() > 10000) {
             throw new RuntimeException("导出数据量过大（单次导出限量10000条数据），请填写条件分批导出");
         }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysPhysicalDefenseConstructionServiceImpl.java

@@ -98,7 +98,8 @@ public class SysPhysicalDefenseConstructionServiceImpl extends ServiceImpl<SysPh
     @Override
     public int insertSysPhysicalDefenseConstruction(SysPhysicalDefenseConstruction sysPhysicalDefenseConstruction) {
         sysPhysicalDefenseConstruction.setCreateTime(DateUtils.getNowDate());
-        sysPhysicalDefenseConstructionMapper.delete(new LambdaQueryWrapper<SysPhysicalDefenseConstruction>().eq(SysPhysicalDefenseConstruction::getOrgId,sysPhysicalDefenseConstruction.getOrgId()).eq(SysPhysicalDefenseConstruction::getType,sysPhysicalDefenseConstruction.getType()).eq(SysPhysicalDefenseConstruction::getStandard,sysPhysicalDefenseConstruction.getStandard()));
+
+//        sysPhysicalDefenseConstructionMapper.delete(new LambdaQueryWrapper<SysPhysicalDefenseConstruction>().eq(SysPhysicalDefenseConstruction::getOrgId, sysPhysicalDefenseConstruction.getOrgId()).eq(SysPhysicalDefenseConstruction::getType, sysPhysicalDefenseConstruction.getType()).eq(SysPhysicalDefenseConstruction::getStandard, sysPhysicalDefenseConstruction.getStandard()));
         return sysPhysicalDefenseConstructionMapper.insert(sysPhysicalDefenseConstruction);
     }
 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/UserExport.java

@@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import com.alibaba.excel.metadata.BaseRowModel;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -17,21 +18,25 @@ import java.util.Date;
 @HeadRowHeight(16) //表头行高
 @ContentRowHeight(16) //数据行高
 public class UserExport {
-
-    @ExcelProperty(value = "用户账号", index = 1)
+    @ExcelProperty(value = "序号", index = 1)
+    @TableField(exist = false)
+    private String xh;
+    @ExcelProperty(value = "用户账号", index = 2)
     private String username;
-    @ExcelProperty(value = "用户姓名", index = 2)
+    @ExcelProperty(value = "用户姓名", index = 3)
     private String name;
-    @ExcelProperty(value = "所属机构", index = 3)
+    @ExcelProperty(value = "所属机构", index = 4)
     private String orgName;
-    @ExcelProperty(value = "用户角色", index = 4)
+    @ExcelProperty(value = "用户角色", index = 5)
     private String roleNames;
-    @ExcelProperty(value = "状态", index = 5,converter = UserStatusConverter.class)
+    @ExcelProperty(value = "手机号码", index = 6)
+    private String phone;
+    @ExcelProperty(value = "状态", index = 7, converter = UserStatusConverter.class)
     private String isLock;
-    @ExcelProperty(value = "是否管理人员", index = 6,converter = UserManagerConverter.class)
+    @ExcelProperty(value = "是否管理人员", index = 8, converter = UserManagerConverter.class)
     private String isManager;
-    @ExcelProperty(value = "登录IP", index = 7)
+    @ExcelProperty(value = "登录IP", index = 9)
     private String lastIp;
-    @ExcelProperty(value = "登录时间", index = 8)
+    @ExcelProperty(value = "登录时间", index = 10)
     private Date lastTime;
 }