Merge branch 'master' into dev-lqc

src/main/java/com/mokamrp/privates/controller/pangu/FosterwxStationPayController.java

@@ -0,0 +1,87 @@
+package com.mokamrp.privates.controller.pangu;
+
+import com.mokamrp.privates.constant.HttpMsg;
+import com.mokamrp.privates.constant.HttpStatus;
+import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.entity.VoltaHandle;
+import com.mokamrp.privates.help.AjaxResult;
+import com.mokamrp.privates.entity.ResHandle;
+import com.mokamrp.privates.help.Analysis;
+import com.mokamrp.privates.interceptor.AuthUser;
+import com.mokamrp.privates.mapper.pojo.User;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.mokamrp.privates.service.pangu.FosterwxStationPayService;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxStationPay;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.mokamrp.privates.controller.BaseController;
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.List;
+
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+
+/**
+ * <p>
+ * 盘古养号站点支出 前端控制器
+ * </p>
+ *
+ * @author leon
+ * @since 2021-12-01
+ */
+@RestController
+@Api(tags = "站点支出")
+@RequestMapping("/fosterwxStationPay")
+public class FosterwxStationPayController extends BaseController<FosterwxStationPay> {
+
+    @Autowired
+    public FosterwxStationPayService fosterwxStationPayService;
+
+    /*
+     * @fast
+     * 默认生成的控制器所继承的父类中有index/add/edit/del四个基础方法,均为post json请求
+     * 如果需要定制化，需要将BaseController中对应的方法复制到当前控制器,然后进行修改
+     */
+
+    @PostMapping("/list")
+    public Object list(@Valid @RequestBody PostBasePageHandle postBasePageHandle, BindingResult bindingResult){
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        ResHandle<List<FosterwxStationPay>> res = fosterwxStationPayService.getList(postBasePageHandle);
+        return AjaxResult.success(res);
+    }
+
+    @PostMapping("/import")
+    public Object uploadFile(@RequestBody MultipartFile file, @AuthUser User authUser) {
+        Map<String, Object> map = new HashMap<>(16);
+        Map<Integer, String> feild = new HashMap<>(5);
+        feild.put(0, "stationName");
+        feild.put(1, "payType");
+        feild.put(2, "amtType");
+        feild.put(3, "amt");
+        feild.put(4, "payAt");
+        feild.put(5, "remark|default");
+        List<Map<String, String>> row = new ArrayList<>();
+        VoltaHandle<ArrayList<Map<String, String>>> voltaRes = Analysis.analysis(file, feild);
+        if (voltaRes.getErr() != null) {
+            return AjaxResult.error(voltaRes.getErr());
+        }
+        row = voltaRes.getData();
+        try {
+            VoltaHandle<Boolean> res = fosterwxStationPayService.importData(row, authUser);
+        } catch (Exception e) {
+            return AjaxResult.error(e.getMessage());
+        }
+        return AjaxResult.success(HttpMsg.importSuccess);
+    }
+}
+

src/main/java/com/mokamrp/privates/entity/PostBasePageHandle.java

@@ -3,6 +3,7 @@ package com.mokamrp.privates.entity;
 import lombok.Data;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
@@ -29,8 +30,11 @@ public class PostBasePageHandle {
     private Integer materialId;
     private Integer tagId;
     private String domain;
+    private String content;
     private LocalDate startDate;
     private LocalDate endDate;
+    private LocalDateTime startDateTime;
+    private LocalDateTime endDateTime;
     public Integer getPage() {
         return page;
     }

src/main/java/com/mokamrp/privates/mapper/WorkComplainH5RecordMapper.java

@@ -1,5 +1,6 @@
 package com.mokamrp.privates.mapper;
 
+import com.mokamrp.privates.entity.PostBasePageHandle;
 import com.mokamrp.privates.mapper.pojo.WorkComplainH5Record;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -17,5 +18,5 @@ import java.util.List;
  */
 @Component
 public interface WorkComplainH5RecordMapper extends BaseMapper<WorkComplainH5Record> {
-    public List<WorkComplainH5Record> getList(Page<WorkComplainH5Record> pageObj);
+    public List<WorkComplainH5Record> getList(Page<WorkComplainH5Record> pageObj, @Param("params")PostBasePageHandle handle);
 }

src/main/java/com/mokamrp/privates/mapper/WorkComplainH5RecordMapper.xml

@@ -18,5 +18,11 @@
     </sql>
     <select id="getList" resultType="com.mokamrp.privates.mapper.pojo.WorkComplainH5Record">
         SELECT * FROM private_work_complain_h5_record
+        <where>
+            <if test="params.type != null">and complain_type = #{params.type}</if>
+            <if test="params.content != null">and content like concat('%',#{params.content},'%')</if>
+            <if test="params.startDate != null and params.endDate != null">and create_at between #{params.startDate} and #{params.endDate}</if>
+        </where>
+        order by create_at desc
     </select>
 </mapper>

src/main/java/com/mokamrp/privates/mapper/WorkComplainH5TypeMapper.xml

@@ -17,5 +17,6 @@
     </sql>
     <select id="getList" resultType="com.mokamrp.privates.mapper.pojo.WorkComplainH5Type">
         SELECT * FROM private_work_complain_h5_type
+        order by seq asc
     </select>
 </mapper>

src/main/java/com/mokamrp/privates/mapper/data/H5ComplaintBtnClickMapper.java

@@ -1,5 +1,6 @@
 package com.mokamrp.privates.mapper.data;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.mokamrp.privates.mapper.data.pojo.H5ComplaintBtnClick;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -16,6 +17,7 @@ import java.util.List;
  * @since 2021-11-30
  */
 @Component
+@DS("datadb")
 public interface H5ComplaintBtnClickMapper extends BaseMapper<H5ComplaintBtnClick> {
     public List<H5ComplaintBtnClick> getList(Page<H5ComplaintBtnClick> pageObj);
 }

src/main/java/com/mokamrp/privates/mapper/data/H5ComplaintOpenMapper.java

@@ -1,5 +1,6 @@
 package com.mokamrp.privates.mapper.data;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.mokamrp.privates.entity.PostBasePageHandle;
 import com.mokamrp.privates.mapper.data.pojo.H5ComplaintOpen;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -17,6 +18,7 @@ import java.util.List;
  * @since 2021-11-30
  */
 @Component
+@DS("datadb")
 public interface H5ComplaintOpenMapper extends BaseMapper<H5ComplaintOpen> {
     public List<H5ComplaintOpen> getList(Page<H5ComplaintOpen> pageObj, @Param("params")PostBasePageHandle postBasePageHandle);
 }

src/main/java/com/mokamrp/privates/mapper/data/H5ComplaintOpenMapper.xml

@@ -16,13 +16,14 @@
         id, page_show, domain, ip, date
     </sql>
     <select id="getList" resultType="com.mokamrp.privates.mapper.data.pojo.H5ComplaintOpen">
-        SELECT A.*,B.submit_cnt FROM workwx_h5_complaint_open as A
-        left join (select date,domain,SUM(submit_btn_click) as submit_cnt from workwx_h5_complaint_btn_click group by date,domain)
-            as B on A.date = B.date and A.domain = B.domain
-        group by A.date,A.domain
+        select T.* from (SELECT A.*,B.submit_cnt FROM workwx_h5_complaint_open as A
+                        left join (select date,domain,SUM(submit_btn_click) as submit_cnt from workwx_h5_complaint_btn_click group by date,domain)
+                        as B on A.date = B.date and A.domain = B.domain
+        group by A.date,A.domain) as T
         <where>
-            <if test="params.domain != null">and A.domain = #{params.domain}</if>
-            <if test="params.startDate != null and params.endDate != null">and A.date between #{params.startDate} and #{params.endDate}</if>
+            <if test="params.domain != null">and T.domain = #{params.domain}</if>
+            <if test="params.startDate != null and params.endDate != null">and T.date between #{params.startDate} and #{params.endDate}</if>
         </where>
+        order by T.date desc
     </select>
 </mapper>

src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxCashWorkBoxClientInfoMapper.xml

@@ -37,5 +37,6 @@
             </foreach>
         </if>
         </where>
+        order by id desc
     </select>
 </mapper>

src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxStationPayMapper.java

@@ -0,0 +1,22 @@
+package com.mokamrp.privates.mapper.pangu;
+
+import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxStationPay;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Component;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+/**
+ * <p>
+ * 盘古养号站点支出 Mapper 接口
+ * </p>
+ *
+ * @author leon
+ * @since 2021-12-01
+ */
+@Component
+public interface FosterwxStationPayMapper extends BaseMapper<FosterwxStationPay> {
+    public List<FosterwxStationPay> getList(Page<FosterwxStationPay> pageObj, @Param("params") PostBasePageHandle handle);
+}

src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxStationPayMapper.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mokamrp.privates.mapper.pangu.FosterwxStationPayMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pangu.pojo.FosterwxStationPay">
+        <id column="id" property="id" />
+        <result column="station_id" property="stationId" />
+        <result column="pay_type" property="payType" />
+        <result column="amt_type" property="amtType" />
+        <result column="amt" property="amt" />
+        <result column="remark" property="remark" />
+        <result column="pay_at" property="payAt" />
+        <result column="create_uid" property="createUid" />
+        <result column="create_at" property="createAt" />
+        <result column="update_at" property="updateAt" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, station_id, pay_type, amt_type, amt, remark, pay_at, create_uid, create_at, update_at
+    </sql>
+    <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxStationPay">
+        SELECT * FROM pan_fosterwx_station_pay
+        <where>
+            <if test="params.stationId != nil">and station_id = #{params.stationId}</if>
+            <if test="params.type != nil">and station_id = #{params.stationId}</if>
+            <if test="params.stationId != nil">and station_id = #{params.stationId}</if>
+            <if test="params.stationId != nil">and station_id = #{params.stationId}</if>
+        </where>
+    </select>
+</mapper>

src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxStationPay.java

@@ -0,0 +1,91 @@
+package com.mokamrp.privates.mapper.pangu.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 盘古养号站点支出
+ * </p>
+ *
+ * @author leon
+ * @since 2021-12-01
+ */
+@Data
+@TableName("pan_fosterwx_station_pay")
+public class FosterwxStationPay extends Model<FosterwxStationPay> {
+
+    private static final long serialVersionUID = 1L;
+
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 站点ID
+     */
+    private Integer stationId;
+
+    /**
+     * 支付分配(1.养号支出2.运营支出)
+     */
+    private Integer payType;
+
+    /**
+     * 费用类型(1.手机采购
+
+2.辅材费用
+
+3.首充话费报销
+
+4.注册验收奖金
+
+5.养号完成奖金
+
+6.推荐人奖金
+
+7.接待费用
+
+8.其他
+
+9.每月预支话费
+
+10.每月工资)
+     */
+    private Integer amtType;
+
+    /**
+     * 金额
+     */
+    private Double amt;
+
+    /**
+     * 说明
+     */
+    private String remark;
+
+    /**
+     * 支出时间
+     */
+    private LocalDateTime payAt;
+
+    /**
+     * 操作人
+     */
+    private Integer createUid;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createAt;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateAt;
+}

src/main/java/com/mokamrp/privates/service/data/impl/H5ComplaintBtnClickServiceImpl.java

@@ -1,5 +1,6 @@
 package com.mokamrp.privates.service.data.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.mokamrp.privates.mapper.data.pojo.H5ComplaintBtnClick;
 import com.mokamrp.privates.mapper.data.H5ComplaintBtnClickMapper;
 import com.mokamrp.privates.service.data.H5ComplaintBtnClickService;
@@ -21,6 +22,7 @@ import java.util.*;
  * @since 2021-11-30
  */
 @Service
+@DS("datadb")
 public class H5ComplaintBtnClickServiceImpl extends ServiceImpl<H5ComplaintBtnClickMapper, H5ComplaintBtnClick> implements H5ComplaintBtnClickService {
 
     @Autowired

src/main/java/com/mokamrp/privates/service/data/impl/H5ComplaintOpenServiceImpl.java

@@ -1,5 +1,6 @@
 package com.mokamrp.privates.service.data.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.mokamrp.privates.mapper.data.pojo.H5ComplaintOpen;
 import com.mokamrp.privates.mapper.data.H5ComplaintOpenMapper;
 import com.mokamrp.privates.service.data.H5ComplaintOpenService;
@@ -21,6 +22,7 @@ import java.util.*;
  * @since 2021-11-30
  */
 @Service
+@DS("datadb")
 public class H5ComplaintOpenServiceImpl extends ServiceImpl<H5ComplaintOpenMapper, H5ComplaintOpen> implements H5ComplaintOpenService {
 
     @Autowired

src/main/java/com/mokamrp/privates/service/impl/WorkComplainH5RecordServiceImpl.java

@@ -34,7 +34,7 @@ public class WorkComplainH5RecordServiceImpl extends ServiceImpl<WorkComplainH5R
         Integer pagesize = handle.getPagesize();
         Integer page = handle.getPage();
         Page<WorkComplainH5Record> pageObj = new Page<WorkComplainH5Record>(page, pagesize);
-        List<WorkComplainH5Record> list = workComplainH5RecordMapper.getList(pageObj);
+        List<WorkComplainH5Record> list = workComplainH5RecordMapper.getList(pageObj,handle);
         ResHandle<List<WorkComplainH5Record>> res = new ResHandle<>();
         res.setList(list);
         res.setTotal(pageObj.getTotal());

src/main/java/com/mokamrp/privates/service/pangu/FosterwxStationPayService.java

@@ -0,0 +1,25 @@
+package com.mokamrp.privates.service.pangu;
+
+import com.mokamrp.privates.entity.VoltaHandle;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxStationPay;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.entity.ResHandle;
+import com.mokamrp.privates.mapper.pojo.User;
+
+import java.util.List;
+import java.util.Map;
+/**
+ * <p>
+ * 盘古养号站点支出 服务类
+ * </p>
+ *
+ * @author leon
+ * @since 2021-12-01
+ */
+public interface FosterwxStationPayService extends IService<FosterwxStationPay> {
+    //.@leon 获取数据列表
+    public ResHandle<List<FosterwxStationPay>> getList(PostBasePageHandle handle);
+
+    public VoltaHandle<Boolean> importData(List<Map<String, String>> row, User authUser) throws Exception;
+}

src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxStationPayServiceImpl.java

@@ -0,0 +1,93 @@
+package com.mokamrp.privates.service.pangu.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.mokamrp.privates.entity.VoltaHandle;
+import com.mokamrp.privates.mapper.pangu.pojo.*;
+import com.mokamrp.privates.mapper.pangu.FosterwxStationPayMapper;
+import com.mokamrp.privates.mapper.pojo.Corp;
+import com.mokamrp.privates.mapper.pojo.User;
+import com.mokamrp.privates.service.pangu.FosterwxStationPayService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mokamrp.privates.service.pangu.FosterwxStationService;
+import org.springframework.stereotype.Service;
+import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import com.mokamrp.privates.entity.ResHandle;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 盘古养号站点支出 服务实现类
+ * </p>
+ *
+ * @author leon
+ * @since 2021-12-01
+ */
+@Service
+public class FosterwxStationPayServiceImpl extends ServiceImpl<FosterwxStationPayMapper, FosterwxStationPay> implements FosterwxStationPayService {
+
+    @Autowired
+    public FosterwxStationPayMapper fosterwxStationPayMapper;
+
+    @Autowired
+    public FosterwxStationService fosterwxStationService;
+    /**
+     * 获取数据列表 支持分页
+     * @param handle
+     * @return
+     */
+    public ResHandle<List<FosterwxStationPay>> getList(PostBasePageHandle handle) {
+        Integer pagesize = handle.getPagesize();
+        Integer page = handle.getPage();
+        Page<FosterwxStationPay> pageObj = new Page<FosterwxStationPay>(page, pagesize);
+        List<FosterwxStationPay> list = fosterwxStationPayMapper.getList(pageObj,handle);
+        ResHandle<List<FosterwxStationPay>> res = new ResHandle<>();
+        res.setList(list);
+        res.setTotal(pageObj.getTotal());
+        return res;
+    }
+
+    /**
+     * 导入数据
+     *
+     * @param row
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public VoltaHandle<Boolean> importData(List<Map<String, String>> row, User authUser) throws Exception {
+        VoltaHandle<Boolean> res = new VoltaHandle<>();
+        if (row.size() <= 0) {
+            throw new Exception("表格读取完成后，没有获取到任何数据");
+        }
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        for (int i = 0; i < row.size(); i++) {
+            LocalDateTime nowDate = LocalDateTime.now();
+            Map<String, String> cell = row.get(i);
+            FosterwxStationPay fosterwxStationPay = new FosterwxStationPay();
+            FosterwxStation stationInfo = fosterwxStationService.getOne(new QueryWrapper<FosterwxStation>()
+                    .eq("station_name", row.get(i).get("stationName")));
+            if (stationInfo == null) {
+                throw new Exception("站点编号不存在");
+            }
+            fosterwxStationPay.setStationId(stationInfo.getId());
+            fosterwxStationPay.setPayType(Integer.parseInt(row.get(i).get("payType")));
+            fosterwxStationPay.setAmtType(Integer.parseInt(row.get(i).get("amtType")));
+            fosterwxStationPay.setAmt(Double.valueOf(row.get(i).get("amt")));
+            fosterwxStationPay.setPayAt(LocalDateTime.parse(row.get(i).get("payAt") + " 00:00:00", df));
+            fosterwxStationPay.setRemark(row.get(i).get("remark"));
+            fosterwxStationPay.setCreateAt(nowDate);
+            fosterwxStationPay.setUpdateAt(nowDate);
+            fosterwxStationPay.setCreateUid(authUser.getId());
+            this.save(fosterwxStationPay);
+        }
+        return res;
+    }
+}

src/test/java/com/mokamrp/AutoMPPangu.java

@@ -46,7 +46,7 @@ public class AutoMPPangu {
                 .setColumnNaming(NamingStrategy.underline_to_camel)
                 .setNaming(NamingStrategy.underline_to_camel) // 数据库表映射到实体的命名策略，下划线转驼峰命名
                 .setTablePrefix("pan_") //表名前缀
-                .setInclude("pan_fosterwx_station_bind_box_group");
+                .setInclude("pan_fosterwx_station_pay");
         //4. 包名策略配置
         PackageConfig pkConfig = new PackageConfig();
         pkConfig.setParent("com.mokamrp.privates")