[任务]修改方法

dev-repair/src/main/java/com/tykj/dev/device/repair/subject/vo/WaitingRepairEquipmentVo.java

+package com.tykj.dev.device.repair.subject.vo;
+
+import com.tykj.dev.device.repair.subject.domin.RepairDetail;
+import com.tykj.dev.device.task.subject.vo.TaskUserVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.CreatedBy;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedBy;
+import org.springframework.data.annotation.LastModifiedDate;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Transient;
+import java.util.Date;
+
+
+/**
+ * DATE:2021-6-28
+ * Author:zsp
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("送修装备返回类")
+public class WaitingRepairEquipmentVo {
+
+    /**
+     * 主键id
+     */
+    @Id
+    @GeneratedValue
+    @ApiModelProperty(name = "主键id")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
+    private Integer id;
+
+    @ApiModelProperty(name = "父id")
+    private Integer pid;
+
+    /**
+     * 装备id
+     */
+    @ApiModelProperty(value = "装备id")
+    private Integer deviceId;
+    /**
+     * 型号
+     */
+    @ApiModelProperty(value = "型号")
+    private String model;
+    /**
+     * 名称
+     */
+    @ApiModelProperty(value = "名称")
+    private String name;
+    /**
+     * 类型
+     */
+    @ApiModelProperty(value = "类型")
+    private Integer type;
+    /**
+     * 装备序列号
+     */
+    @ApiModelProperty(value = "装备序列号")
+    private String seqNumber;
+    /**
+     * rfid表面号
+     */
+    @ApiModelProperty(value = "rfid表面号")
+    private String rfidSurfaceId;
+
+    /**
+     * 维修单id
+     */
+    @ApiModelProperty(value = "维修单id")
+    private Integer deviceRepairBillId;
+
+    /**
+     * 所在单位
+     */
+    @ApiModelProperty(value = "所在单位")
+    private String locationUnit;
+    /**
+     * 所属单位
+     */
+    @ApiModelProperty(value = "所属单位")
+    private String ownUnit;
+    /**
+     * 维修状态
+     */
+    @ApiModelProperty(value = "维修状态")
+    private Integer repairStatus;
+    /**
+     * 维修备注
+     */
+    @ApiModelProperty(value = "维修备注")
+    private String remark;
+    /**
+     * 维修领取备注
+     */
+    @ApiModelProperty(value = "维修领取备注")
+    private String backRemark;
+    /**
+     * 已报废换新装备详情主键Id(null代表没有报废，0代表已报废还没有换新)
+     */
+    @ApiModelProperty(value = "已报废换新装备详情主键Id(null代表没有报废，0代表已报废还没有换新)")
+    private Integer newDeviceDetailId;
+    /**
+     * 创建用户id
+     */
+    @ApiModelProperty(value = "创建用户id")
+    @CreatedBy
+    private Integer createUserId;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    @CreatedDate
+    private Date createTime;
+    /**
+     * 更新用户id
+     */
+    @ApiModelProperty(value = "更新用户id")
+    @LastModifiedBy
+    private Integer updateUserId;
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间")
+    @LastModifiedDate
+    private Date updateTime;
+    /**
+     * 删除标记(0:未删除，1:已删除)
+     */
+    @ApiModelProperty(value = "删除标记(0:未删除，1:已删除)")
+    private Integer deleteTag = 0;
+
+    @ApiModelProperty(value = "区块链记录id")
+    private String recordId;
+
+    @ApiModelProperty(value = "省维修记录信息")
+    private String record;
+
+    @ApiModelProperty(value = "市维修记录信息")
+    private String record2;
+
+    @ApiModelProperty(value = "县维修记录信息")
+    private String record3;
+
+    @ApiModelProperty(value = "领取单id")
+    private Integer repairBackBillId;
+
+    @ApiModelProperty(value = "形态")
+    @Transient
+    private String typeName;
+
+    @ApiModelProperty(value = "任务uservo")
+    private TaskUserVo taskUserVos;
+}

dev-user/src/main/java/com/tykj/dev/device/user/subject/dao/UserDao.java

@@ -31,5 +31,6 @@ public interface UserDao extends JpaRepository<User, Integer>, JpaSpecificationE
     @Query("update User o set o.trainStatus = :trainStatus where o.userId in :userIds")
     int upDateUserIdsAndTrainStatus(@Param("userIds") List<Integer> userIds,Integer trainStatus);
 
+    User findByName(String name);
 
 }

dev-user/src/main/java/com/tykj/dev/device/user/subject/service/UserService.java

@@ -10,6 +10,7 @@ import com.tykj.dev.device.user.subject.entity.Units;
 import com.tykj.dev.device.user.subject.entity.User;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author zjm
@@ -27,7 +28,8 @@ public interface UserService extends PublicService<User> {
      */
     User findByUserName(String userName);
 
-    User save(User user, SecurityUser securityUser);
+//    User save(User user, SecurityUser securityUser);
+    Map save(User user, SecurityUser securityUser);
 
     /**
      * 查询同级人员

dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/UserServiceImpl.java

@@ -29,6 +29,7 @@ import org.springframework.stereotype.Service;
 
 import javax.persistence.Transient;
 import java.lang.reflect.Field;
+import java.rmi.MarshalledObject;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -73,12 +74,24 @@ public class UserServiceImpl implements UserService {
     ConfigCache configCache;
 
     @Override
-    public User save(User user, SecurityUser securityUser) {
+    public Map save(User user, SecurityUser securityUser) {
+        Map<String, Object> map = new HashMap<>();
         String encode = bCryptPasswordEncoder.encode("qwer1234");
         user.setPassword(encode);
         user.setNoPassword("qwer1234");
         Units units = unitsService.findById(user.getUnitsId());
         user.setShowOrder(userDao.maxShowOrder(units.getUnitId())+1);
+        //先判断用户名是否被注册
+        User byName = userDao.findByName(user.getName());
+        if (byName != null){
+            map.put("error",byName);
+            return map;
+        }
+        User byUsername = userDao.findByUsername(user.getUsername());
+        if (byUsername != null){
+            map.put("error",byUsername);
+            return map;
+        }
         User user1 = userDao.save(user);
         switch (units.getLevel()){
             case 1:
@@ -94,10 +107,11 @@ public class UserServiceImpl implements UserService {
                 log.info("[user] 添加转管员单位等级不存在：{}",units.getLevel());
 
         }
-        messageService.add(new MessageBto(0,-1,securityUser.getUsername()+"添加专管员"+user1.getUsername(),this.findAllLastUserids(securityUser.getCurrentUserInfo().getUserId())));
+        messageService.add(new MessageBto(0,-1,securityUser.getCurrentUserInfo().getName()+"添加专管员"+user1.getName(),this.findAllLastUserids(securityUser.getCurrentUserInfo().getUserId())));
         userLogService.save(new UserLog(user1.getUserId(),new Date(),"专管员任命成功"));
         userCache.refresh(userDao.findAll());
-        return user1;
+        map.put("user1",user1);
+        return map;
     }