整合完成

src/main/java/com/usky/dxtop/common/core/domain/BaseEntity.java

@@ -36,6 +36,7 @@ public class BaseEntity implements Serializable
     private Date updateTime;
 
     /** 备注 */
+    @TableField(exist = false)
     private String remark;
 
     /** 请求参数 */

src/main/java/com/usky/dxtop/mapper/SysDeptMapper.java

@@ -2,7 +2,9 @@ package com.usky.dxtop.mapper;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.usky.dxtop.model.SysDept;
+import com.usky.dxtop.model.SysUser;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -13,7 +15,7 @@ import org.springframework.stereotype.Repository;
  * @author yq
  */
 @Repository
-public interface SysDeptMapper
+public interface SysDeptMapper extends BaseMapper<SysDept>
 {
     /**
      * 查询部门管理数据

src/main/java/com/usky/dxtop/mapper/SysUserMapper.java

@@ -1,7 +1,9 @@
 package com.usky.dxtop.mapper;
 
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.usky.dxtop.model.SysUser;
+import com.usky.dxtop.model.TopRadio;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -14,7 +16,7 @@ import java.util.List;
  * @author yq
  */
 @Repository
-public interface SysUserMapper
+public interface SysUserMapper extends BaseMapper<SysUser>
 {
     /**
      * 根据条件分页查询用户列表

src/main/java/com/usky/dxtop/model/Staff.java

@@ -160,5 +160,8 @@ public class Staff implements Serializable {
      */
     private String openId;
 
+    @TableField(exist = false)
+    private String username;
+
 
 }

src/main/java/com/usky/dxtop/model/SysDept.java

@@ -1,5 +1,7 @@
 package com.usky.dxtop.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.usky.dxtop.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -21,6 +23,7 @@ public class SysDept extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 部门ID */
+    @TableId(value = "dept_id")
     private Long deptId;
 
     /** 父部门ID */
@@ -51,9 +54,33 @@ public class SysDept extends BaseEntity
     private String delFlag;
 
     /** 父部门名称 */
+    @TableField(exist = false)
     private String parentName;
+
+    public String getCenterDeptId() {
+        return centerDeptId;
+    }
+
+    public void setCenterDeptId(String centerDeptId) {
+        this.centerDeptId = centerDeptId;
+    }
+
+    /** 中控部门id */
+    private String centerDeptId;
+
+    public String getCenterParentId() {
+        return centerParentId;
+    }
+
+    public void setCenterParentId(String centerParentId) {
+        this.centerParentId = centerParentId;
+    }
+
+    /** 中控父部门id */
+    private String centerParentId;
     
     /** 子部门 */
+    @TableField(exist = false)
     private List<SysDept> children = new ArrayList<SysDept>();
 
     public Long getDeptId()
@@ -172,6 +199,7 @@ public class SysDept extends BaseEntity
         this.parentName = parentName;
     }
 
+
     public List<SysDept> getChildren()
     {
         return children;

src/main/java/com/usky/dxtop/model/SysUser.java

@@ -1,5 +1,7 @@
 package com.usky.dxtop.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.usky.dxtop.common.core.domain.BaseEntity;
@@ -23,6 +25,7 @@ public class SysUser extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 用户ID */
+    @TableId
     private Long userId;
 
     /** 部门ID */
@@ -68,16 +71,22 @@ public class SysUser extends BaseEntity
     private SysDept dept;
 
     /** 角色对象 */
+    @TableField(exist = false)
     private List<SysRole> roles;
 
     /** 角色组 */
+    @TableField(exist = false)
     private Long[] roleIds;
 
     /** 岗位组 */
+    @TableField(exist = false)
     private Long[] postIds;
 
     /** 角色ID */
+    @TableField(exist = false)
     private Long roleId;
+    /** 中控用户id */
+    private String centerUserId;
 
     public SysUser()
     {
@@ -322,4 +331,12 @@ public class SysUser extends BaseEntity
             .append("dept", getDept())
             .toString();
     }
+
+    public String getCenterUserId() {
+        return centerUserId;
+    }
+
+    public void setCenterUserId(String centerUserId) {
+        this.centerUserId = centerUserId;
+    }
 }

src/main/java/com/usky/dxtop/service/ISysDeptService.java

@@ -1,7 +1,9 @@
 package com.usky.dxtop.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.usky.dxtop.common.core.domain.TreeSelect;
 import com.usky.dxtop.model.SysDept;
+import com.usky.dxtop.model.SysUser;
 
 import java.util.List;
 
@@ -11,7 +13,7 @@ import java.util.List;
  * 
  * @author yq
  */
-public interface ISysDeptService
+public interface ISysDeptService extends IService<SysDept>
 {
     /**
      * 查询部门管理数据
@@ -108,4 +110,7 @@ public interface ISysDeptService
      * @return 结果
      */
     public int deleteDeptById(Long deptId);
+
+
+    public void setDeptTree(List<SysDept> sysDepts);
 }

src/main/java/com/usky/dxtop/service/ISysUserService.java

@@ -1,6 +1,8 @@
 package com.usky.dxtop.service;
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.usky.dxtop.model.MsgLog;
 import com.usky.dxtop.model.SysUser;
 
 import java.util.List;
@@ -10,7 +12,7 @@ import java.util.List;
  * 
  * @author yq
  */
-public interface ISysUserService
+public interface ISysUserService extends IService<SysUser>
 {
     /**
      * 根据条件分页查询用户列表

src/main/java/com/usky/dxtop/service/config/MybatisPlusConfig.java

@@ -24,6 +24,7 @@ public class MybatisPlusConfig {
         // 设置最大单页限制数量，默认 500 条，-1 不受限制
         // paginationInterceptor.setLimit(500);
         // 开启 count 的 join 优化,只针对部分 left join
+        paginationInterceptor.setLimit(-1);
         paginationInterceptor.setCountSqlParser(new JsqlParserCountOptimize(true));
         return paginationInterceptor;
     }

src/main/java/com/usky/dxtop/service/impl/OrderServiceImpl.java

@@ -474,6 +474,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Transactional(rollbackFor = Exception.class)
     @Override
     public String callUnifiedPay(Order order) {
+        log.info("统一支付接口传递的参数:--------------"+order);
         String appId = null;
         String openId = null;
         if ("W06".equals(order.getTopPayType())){

src/main/java/com/usky/dxtop/service/impl/SysDeptServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.usky.dxtop.common.annotation.DataScope;
 import com.usky.dxtop.common.constant.UserConstants;
 import com.usky.dxtop.common.core.domain.TreeSelect;
@@ -13,8 +14,11 @@ import com.usky.dxtop.common.exception.CustomException;
 import com.usky.dxtop.common.utils.StringUtils;
 import com.usky.dxtop.mapper.SysDeptMapper;
 import com.usky.dxtop.mapper.SysRoleMapper;
+import com.usky.dxtop.mapper.SysUserMapper;
+import com.usky.dxtop.model.Dept;
 import com.usky.dxtop.model.SysDept;
 import com.usky.dxtop.model.SysRole;
+import com.usky.dxtop.model.SysUser;
 import com.usky.dxtop.service.ISysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -26,7 +30,7 @@ import org.springframework.stereotype.Service;
  * @author yq
  */
 @Service
-public class SysDeptServiceImpl implements ISysDeptService
+public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>  implements ISysDeptService
 {
     @Autowired
     private SysDeptMapper deptMapper;
@@ -264,6 +268,25 @@ public class SysDeptServiceImpl implements ISysDeptService
         return deptMapper.deleteDeptById(deptId);
     }
 
+    @Override
+    public void setDeptTree(List<SysDept> sysDepts) {
+        List<String> tempList = sysDepts.stream().map(SysDept::getCenterDeptId).collect(Collectors.toList());
+        for (SysDept sysDept:sysDepts) {
+            try {
+                // 如果是顶级节点, 遍历该父节点的所有子节点
+                if (!tempList.contains(sysDept.getCenterParentId()))
+                {
+                    sysDept.setParentId(0L);
+                    sysDept.setAncestors("0");
+                    recursionFnOne(sysDepts, sysDept);
+                    this.updateById(sysDept);
+                }
+            }catch (Exception e){
+                log.error("同步部门异常:"+e.getMessage());
+            }
+        }
+    }
+
     /**
      * 递归列表
      */
@@ -281,6 +304,36 @@ public class SysDeptServiceImpl implements ISysDeptService
         }
     }
 
+    private void recursionFnOne(List<SysDept> list, SysDept t){
+        // 得到子节点列表
+        List<SysDept> childList = getChildListOne(list, t);
+        t.setChildren(childList);
+        for (SysDept tChild : childList)
+        {
+            tChild.setParentId(t.getDeptId());
+            tChild.setAncestors(t.getAncestors() + "," + tChild.getParentId());
+            this.updateById(tChild);
+            if (hasChildOne(list, tChild))
+            {
+                recursionFnOne(list, tChild);
+            }
+        }
+    }
+
+    public List<SysDept> getChildListOne(List<SysDept> list, SysDept t){
+        List<SysDept> tlist = new ArrayList<SysDept>();
+        Iterator<SysDept> it = list.iterator();
+        while (it.hasNext())
+        {
+            SysDept n = (SysDept) it.next();
+            if (StringUtils.isNotNull(n.getCenterParentId()) && n.getCenterParentId().equals(t.getCenterDeptId()))
+            {
+                tlist.add(n);
+            }
+        }
+        return tlist;
+    }
+
     /**
      * 得到子节点列表
      */
@@ -306,4 +359,11 @@ public class SysDeptServiceImpl implements ISysDeptService
     {
         return getChildList(list, t).size() > 0 ? true : false;
     }
+
+    private boolean hasChildOne(List<SysDept> list, SysDept t)
+    {
+        return getChildListOne(list, t).size() > 0 ? true : false;
+    }
+
+
 }

src/main/java/com/usky/dxtop/service/impl/SysUserServiceImpl.java

@@ -3,12 +3,14 @@ package com.usky.dxtop.service.impl;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.usky.dxtop.common.annotation.DataScope;
 import com.usky.dxtop.common.constant.UserConstants;
 
 import com.usky.dxtop.common.exception.CustomException;
 import com.usky.dxtop.common.utils.SecurityUtils;
 import com.usky.dxtop.common.utils.StringUtils;
+import com.usky.dxtop.framework.web.domain.server.Sys;
 import com.usky.dxtop.mapper.*;
 import com.usky.dxtop.model.*;
 import com.usky.dxtop.service.ISysConfigService;
@@ -26,7 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @author yq
  */
 @Service
-public class SysUserServiceImpl implements ISysUserService
+public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService
 {
     private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
 

src/main/java/com/usky/dxtop/service/job/CenterUserJob.java

@@ -0,0 +1,141 @@
+package com.usky.dxtop.service.job;
+
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.dxtop.common.utils.SecurityUtils;
+import com.usky.dxtop.common.utils.StringUtils;
+
+import com.usky.dxtop.model.Dept;
+import com.usky.dxtop.model.Staff;
+import com.usky.dxtop.model.SysDept;
+import com.usky.dxtop.model.SysUser;
+import com.usky.dxtop.service.ISysDeptService;
+import com.usky.dxtop.service.ISysUserService;
+import com.usky.dxtop.service.api.SmApi;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.function.Function;
+
+@Component("centerUserJob")
+@Slf4j
+public class CenterUserJob {
+
+    @Autowired
+    private ISysUserService iSysUserService;
+
+    @Autowired
+    private ISysDeptService iSysDeptService;
+
+    @Autowired
+    private SmJob smJob;
+
+
+    public void personExecute(String param) {
+        SmJob.PersonParam personParam = JSON.parseObject(param, SmJob.PersonParam.class);
+        personApi(personParam);
+        log.info("smJob-person 定时任务完成");
+    }
+
+    public void groupExecute(String param) {
+        SmJob.GroupParam groupParam = JSON.parseObject(param, SmJob.GroupParam.class);
+        groupApi(groupParam);
+        log.info("smJob-group 定时任务完成");
+    }
+
+    public void  personApi(SmJob.PersonParam personParam){
+        TreeMap<String, Object> treeMap;
+        if (null != personParam){
+            treeMap = SmApi.generatePersonParam(personParam.getId(),
+                    personParam.getDeptIds(), personParam.getCreateTime(), personParam.getBlurry());
+        }else {
+            treeMap = SmApi.generatePersonParam(null,
+                    null, null, null);
+        }
+        List<SysDept> depts = iSysDeptService.list();
+        smJob.common(SmApi.PERSON_URL,treeMap,staffList -> {
+            List<Staff> list = staffList.toJavaList(Staff.class);
+            list.forEach(date -> {
+                try {
+                    //只负责同步
+                    LambdaQueryWrapper<SysUser> queryWrapper = Wrappers.lambdaQuery();
+                    queryWrapper.eq(SysUser::getCenterUserId,date.getId());
+                    iSysUserService.saveOrUpdate(generateSysUser(date,depts),queryWrapper);
+                }catch (Exception e){
+                    log.error("smJob-person:"+e.getMessage());
+                }
+            });
+            return list.isEmpty();
+        });
+    }
+
+    public void groupApi(SmJob.GroupParam groupParam){
+        TreeMap<String, Object> treeMap;
+        if (null != groupParam){
+            treeMap = SmApi.generateDeptParam(groupParam.getCreateTime(),
+                    groupParam.getName(),groupParam.getPid(),groupParam.getEnable());
+        }else {
+            treeMap = SmApi.generateDeptParam(null,
+                    null,null,null);
+        }
+        smJob.common(SmApi.DEPT_URL,treeMap,deptList -> {
+            List<Dept> list = deptList.toJavaList(Dept.class);
+            list.forEach(date -> {
+                try {
+                    //只负责同步
+                    LambdaQueryWrapper<SysDept> queryWrapper = Wrappers.lambdaQuery();
+                    queryWrapper.eq(SysDept::getCenterDeptId,date.getId());
+                    if (StringUtils.isBlank(date.getPid())){
+                        date.setPid("0");
+                    }
+                    iSysDeptService.saveOrUpdate(generateSysDept(date),queryWrapper);
+                }catch (Exception e){
+                    log.error("smJob-group:"+e.getMessage());
+                }
+            });
+            return list.isEmpty();
+        });
+        //寻找各部门的父id
+        iSysDeptService.setDeptTree(iSysDeptService.list());
+    }
+
+    public SysDept generateSysDept(Dept dept){
+        SysDept sysDept = new SysDept();
+        sysDept.setDeptName(dept.getName());
+        sysDept.setCenterDeptId(dept.getId());
+        sysDept.setOrderNum(dept.getDeptSort().toString());
+        sysDept.setCenterParentId(dept.getPid());
+        return sysDept;
+    }
+
+    public SysUser generateSysUser(Staff staff,List<SysDept> depts){
+        SysUser sysUser = new SysUser();
+        sysUser.setCenterUserId(staff.getId());
+        sysUser.setUserName(staff.getUsername());
+        sysUser.setPassword(SecurityUtils.encryptPassword(staff.getUsername()));
+        sysUser.setPhonenumber(staff.getContacts());
+        sysUser.setEmail(staff.getEmail());
+        if (null != staff.getSex()){
+            if ("男".equals(staff.getSex())){
+                sysUser.setSex("0");
+            }else if ("女".equals(staff.getSex())){
+                sysUser.setSex("1");
+            }else {
+                sysUser.setSex("2");
+            }
+        }
+        sysUser.setNickName(staff.getName());
+
+        //获取部门信息
+        Map deptMap = JSON.parseObject(staff.getDept(), Map.class);
+        SysDept sysDept = depts.stream().filter(dept -> dept.getCenterDeptId().equals(deptMap.get("id").toString())).findAny().get();
+        sysUser.setDeptId(sysDept.getDeptId());
+        return sysUser;
+    }
+}

src/main/resources/mapper/SysDeptMapper.xml

@@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 	
 	<sql id="selectDeptVo">
-        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time 
+        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time
         from sys_dept d
     </sql>
     

src/main/resources/mapper/SysUserMapper.xml

@@ -137,7 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, email from sys_user where email = #{email} limit 1
 	</select>
-	
+
 	<insert id="insertUser" parameterType="com.usky.dxtop.model.SysUser" useGeneratedKeys="true" keyProperty="userId">
  		insert into sys_user(
  			<if test="userId != null and userId != 0">user_id,</if>

src/test/java/com/usky/dxtop/SmApiTest.java

@@ -7,14 +7,17 @@ import com.usky.dxtop.common.utils.Arith;
 import com.usky.dxtop.common.utils.http.HttpUtils;
 import com.usky.dxtop.model.Charge;
 import com.usky.dxtop.model.Dish;
+import com.usky.dxtop.model.Order;
 import com.usky.dxtop.service.ChargeService;
 import com.usky.dxtop.service.DishService;
 import com.usky.dxtop.service.MsgLogService;
 import com.usky.dxtop.service.api.TopApiConfiger;
 import com.usky.dxtop.service.api.WxApi;
+import com.usky.dxtop.service.job.CenterUserJob;
 import com.usky.dxtop.service.job.SmJob;
 import com.usky.dxtop.service.listener.ChargeTransMqListener;
 import com.usky.dxtop.service.listener.DishTransMqListener;
+import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,95 +30,20 @@ import java.util.TreeMap;
  * @author yq
  * @date 2021/9/28 15:11
  */
+@Slf4j
 @RunWith(SpringRunner.class)
 @SpringBootTest
 public class SmApiTest {
 
 
     @Autowired
-    private MsgLogService msgLogService;
+    private CenterUserJob centerUserJob;
 
-    @Autowired
-    private WxApi wxApi;
-
-    @Autowired
-    private ChargeTransMqListener chargeTransMqListener;
-
-    @Autowired
-    private DishTransMqListener dishTransMqListener;
-
-    @Autowired
-    private DishService dishService;
-    @Autowired
-    private ChargeService chargeService;
-
-    @Autowired
-    private SmJob smJob;
-
-    @Autowired
-    private TopApiConfiger topApiConfiger;
     @Test
     public void test1(){
-        smJob.personApi(null);
-    }
-    @Test
-    public void testSendMessage(){
-        Dish dish = dishService.getById(637744684233638175L);
-        wxApi.sendMessageApi("o5P6I5tLj-TjrK7leWUT8EFmTCa4",dishTransMqListener.getMessageData(dish),wxApi.getToken(WxApi.APP_ID,WxApi.SECRET), WxApi.DISH_TEMPLATE_ID,"https://smartpark.caih.com/vuepay/#/record?id=2");
-
-
-        Charge charge = chargeService.getById(637744683598183711L);
-        wxApi.sendMessageApi("o5P6I5tLj-TjrK7leWUT8EFmTCa4",chargeTransMqListener.getMessageData(charge),wxApi.getToken(WxApi.APP_ID,WxApi.SECRET), WxApi.CHARGE_TEMPLATE_ID,"https://smartpark.caih.com/vuepay/#/record?id=2");
+        centerUserJob.groupApi(null);
     }
 
-    @Test
-    public void order(){
-
-        TreeMap<String, String> stringStringTreeMap = topApiConfiger.generateUnifyParam("fsfsfsfjwo1214578", new Double(Arith.mul(0.01, 100)).intValue(),
-                topApiConfiger.notifyUrl, null,
-                null, null, "ojJtF5WLIcOsQVXcLu9n6JkvE0Zw", "W06", null, "wx40274c2aaec24330",
-                null, null, null, null);
-        String unify = topApiConfiger.generateParam(stringStringTreeMap);
-        String result;
-        try {
-            result = HttpUtils.sendGet(topApiConfiger.unifyUrl, unify,null);
-        }catch (Exception e){
-            throw new CustomException("调用统一支付接口异常:"+e.getMessage());
-        }
-        JSONObject obj= JSON.parseObject(result);
-        String payInfo;
-        if ("0000".equals(obj.get("status"))){
-            payInfo = obj.get("payinfo").toString();
-            System.out.println(payInfo);
-        }else {
-            throw new CustomException(obj.get("errorMessage").toString());
-        }
-    }
-
-    public TreeMap<String, String> generateUnifyParam(String merchantOrderNo, Integer amount, String notifyUrl,
-                                                      String backUrl, String note, String orderName, String acct,
-                                                      String payType, String validTime, String subAppid,
-                                                      String remark, String asinfo, String groupNo,
-                                                      String consumerIp){
-        TreeMap<String, String> tMap = new TreeMap<>();
-        tMap.put("version","v1.0");
-        tMap.put("merchantNo","228304018003");
-        tMap.put("merchantOrderNo",merchantOrderNo);
-        tMap.put("amount",amount.toString());
-        tMap.put("notifyUrl",notifyUrl);
-        tMap.put("backUrl",backUrl);
-        tMap.put("note",note);
-        tMap.put("orderName",orderName);
-        tMap.put("acct",acct);
-        tMap.put("payType",payType);
-        tMap.put("validTime",validTime);
-        tMap.put("subAppid",subAppid);
-        tMap.put("remark",remark);
-        tMap.put("asinfo",asinfo);
-        tMap.put("groupNo",groupNo);
-        tMap.put("consumerIp",consumerIp);
-        return tMap;
-    }