第二版,频安宝

src/main/java/com/care/bigscreen/controller/CommonController.java

@@ -28,23 +28,23 @@ public class CommonController {
     CommonService commonService;
     @Autowired
     BigScreenService bigScreenService;
-    /**
-     * 字典：字段查重（字典选项代码）
-     * 作用：添加或修改时对必须唯一的字段进行查重
-     *
-     * @param typeCode 收集需要查重的字段参数
-     * @return 返回0表示字段没有重复，非零表示有重复
-     */
-    @GetMapping("/convertedCodeName")
-    @Permission
-    public Result<Object> convertedCodeName(@RequestHeader("token") String token, @RequestParam("typeCode") String typeCode, @RequestParam("value") String value, HttpServletRequest request) {
-        try {
-            UserLogindConvertVO user = WebPageUtils.getCurrentLoginedUser(request);
-                return Result.success("成功",user);
-        } catch (Exception e) {
-            return Result.error("系统错误，查询失败");
-        }
-    }
+//    /**
+//     * 字典：字段查重（字典选项代码）
+//     * 作用：添加或修改时对必须唯一的字段进行查重
+//     *
+//     * @param typeCode 收集需要查重的字段参数
+//     * @return 返回0表示字段没有重复，非零表示有重复
+//     */
+//    @GetMapping("/convertedCodeName")
+//    @Permission
+//    public Result<Object> convertedCodeName(@RequestHeader("token") String token, @RequestParam("typeCode") String typeCode, @RequestParam("value") String value, HttpServletRequest request) {
+//        try {
+//            UserLogindConvertVO user = WebPageUtils.getCurrentLoginedUser(request);
+//                return Result.success("成功",user);
+//        } catch (Exception e) {
+//            return Result.error("系统错误，查询失败");
+//        }
+//    }
     @GetMapping("/pushEvent")
     public Result<Object> pushEvent(@RequestParam("stationId") Long stationId,@RequestParam(value = "orderId") Long orderId) {
         try {

src/main/java/com/care/bms/controller/DimController.java

@@ -0,0 +1,55 @@
+package com.care.bms.controller;
+
+
+
+import com.care.bms.service.DimCodeService;
+import com.care.common.util.Result;
+import com.care.common.vo.DimCodeVO;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+
+/**
+ * @author
+ * @version 1.0.0 创建于 2019-12-04
+ **/
+@RestController
+@Slf4j
+public class DimController {
+
+    @Resource
+    private DimCodeService dimCodeService;
+
+
+    @ApiOperation(tags = {"编码管理"}, value = "根据编码类型查询编码项全部列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", required = true, name = "token", dataType = "String", value = "token验证信息"),
+            @ApiImplicitParam(name = "typeCode", value = "编码类型，纬度类型表type",
+                    dataType = "String", paramType = "query",
+                    required = true)
+    })
+    @GetMapping(value = "/dict/queryDictItemsByType", produces = "application/json;charset=utf-8")
+    public Result<List<DimCodeVO>> queryDictItemsByType(
+            @RequestHeader(name = "token", required = true) String token,
+            @RequestParam(name = "typeCode", required = true) String typeCode
+            ) {
+        try {
+
+            List<DimCodeVO> list = this.dimCodeService.queryDimCodeByType(typeCode);
+            return Result.success(list);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return Result.error( "获取列表失败");
+        }
+    }
+
+}

src/main/java/com/care/bms/controller/SysUserController.java

@@ -1,8 +1,11 @@
 package com.care.bms.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.care.bms.service.BmsSysUserService;
 import com.care.common.annotation.Permission;
+import com.care.common.entity.CareDevice;
+import com.care.common.entity.CareSysUser;
 import com.care.common.exception.BDException;
 import com.care.common.util.PageResult;
 import com.care.common.util.Result;
@@ -93,9 +96,15 @@ public class SysUserController {
     public Result<Object> addKeeper(HttpServletRequest request,@RequestHeader("token") String token,
                                    @RequestBody CareSysUserVO vo){
         try {
+
             UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            this.bmsSysUserService.createCareSysUser(vo,loginUser);
-            return  Result.success("新增成功！");
+            int flag = this.bmsSysUserService.createCareSysUser(vo,loginUser);
+            if (flag == 1) {
+                return  Result.error("电话已存在！");
+            } else {
+                return  Result.success("新增成功！");
+            }
+
         }catch (BDException e) {
             log.error("新增管家-出现异常",e);
             return Result.error(e.getMessage());

src/main/java/com/care/bms/service/BmsSysUserService.java

@@ -221,7 +221,12 @@ public class BmsSysUserService{
      * @param vo
      */
     @Transactional(rollbackFor = Exception.class)
-    public void createCareSysUser(CareSysUserVO vo,UserLogindConvertVO loginUser){
+    public int createCareSysUser(CareSysUserVO vo,UserLogindConvertVO loginUser){
+        QueryWrapper<CareSysUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(CareSysUser::getPhone,vo.getPhone());
+        if(careSysUserService.count(queryWrapper) > 0){
+            return 1;
+        }
         //保存管家
         CareSysUser careSysUser = new CareSysUser();
         BeanUtil.copyProperties(vo,careSysUser);
@@ -242,6 +247,7 @@ public class BmsSysUserService{
                 careDeviceService.updateById(careDevice);
             });
         }
+        return 0;
     }
 
     /**

src/main/java/com/care/bms/service/DimCodeService.java

@@ -0,0 +1,61 @@
+package com.care.bms.service;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.care.common.entity.CareHouse;
+import com.care.common.entity.CareStation;
+import com.care.common.entity.SysDimCode;
+import com.care.common.enums.KeyEscrowTypeEnum;
+import com.care.common.service.CareHouseService;
+import com.care.common.service.CareMemberInfoService;
+import com.care.common.service.CareStationService;
+import com.care.common.service.SysDimCodeService;
+import com.care.common.util.MyBeanUtils;
+import com.care.common.vo.DimCodeVO;
+import com.care.common.vo.PageReqVO;
+import com.care.common.vo.UserLogindConvertVO;
+import com.care.common.vo.device.HouseVO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author: lilt
+ * @Date: 2021/7/14
+ * @Desc:
+ */
+@Service
+public class DimCodeService {
+    @Resource
+    private SysDimCodeService sysDimCodeService;
+
+
+    /**
+     * 根据typeCode查询编码列表
+     * @return
+     */
+    public List<DimCodeVO> queryDimCodeByType(String typeCode){
+        List<DimCodeVO> datas = new ArrayList<>();
+        QueryWrapper<SysDimCode>  userQueryWrapper = new QueryWrapper<>();
+        userQueryWrapper.lambda().eq(SysDimCode::getTypeCode,typeCode).eq(SysDimCode::getStatus,"1")
+                .orderByAsc(SysDimCode::getCodeIndex);
+        List<SysDimCode> list = this.sysDimCodeService.list(userQueryWrapper);
+        if (list != null){
+            list.forEach(item -> {
+                DimCodeVO vo = new DimCodeVO();
+                BeanUtil.copyProperties(item,vo);
+                datas.add(vo);
+            });
+        }
+        return datas;
+    }
+}

src/main/java/com/care/common/vo/DimCodeVO.java

@@ -0,0 +1,71 @@
+package com.care.common.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 编码明细表(SysDimCode)实体类
+ *
+ * @author makejava
+ * @since 2021-05-21 00:08:38
+ */
+
+@Data
+public class DimCodeVO implements Serializable {
+    private static final long serialVersionUID = -97112002437936953L;
+
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    @ApiModelProperty("0:禁用  1 启用")
+    private String status;
+
+
+    @ApiModelProperty("纬度类型表type，sys_dim_type表中的type")
+    private String typeCode;
+
+
+    @ApiModelProperty("编码")
+    private String dimCode;
+
+
+    @ApiModelProperty("编码名称")
+    private String name;
+
+
+    @ApiModelProperty("排序字段")
+    private Integer codeIndex;
+
+
+    @ApiModelProperty("描述")
+    private String descMsg;
+
+
+    @ApiModelProperty("createUserId")
+    private String createUserId;
+
+
+    @ApiModelProperty("createTime")
+    private Date createTime;
+
+
+    @ApiModelProperty("updateTime")
+    private Date updateTime;
+
+
+    @ApiModelProperty("操作人")
+    private String updateUserId;
+
+
+}

src/main/java/com/care/common/vo/sysuser/CareSysUserVO.java

@@ -75,7 +75,7 @@ public class CareSysUserVO implements Serializable {
     @ApiModelProperty("1:坐席 2:管家")
     private String role;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     @ApiModelProperty("服务入职时间")
     private Date hiredate;