修复部分BUG

src/main/java/com/mokamrp/privates/controller/BaseController.java

@@ -8,6 +8,7 @@ import com.mokamrp.privates.constant.Constants;
 import com.mokamrp.privates.constant.HttpStatus;
 import com.mokamrp.privates.entity.*;
 import com.mokamrp.privates.help.AjaxResult;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskCatalog;
 import com.mokamrp.privates.mapper.pangu.pojo.PromoteCode;
 import com.mokamrp.privates.mapper.pangu.pojo.PromoteQrcodePool;
 import com.mokamrp.privates.utils.StringUtils;
@@ -22,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import javax.validation.Valid;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
 import java.time.LocalDateTime;
 import java.util.*;
 
@@ -50,6 +52,35 @@ public class BaseController<T> {
         return AjaxResult.success(Constants.SUCCESS, res);
     }
 
+    @PostMapping("/softdel")
+    public Object softDelete(@Valid @RequestBody DelHandle<T> delHandle, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        QueryWrapper<T> QueryWrapper = new QueryWrapper<>();
+        String[] ids = delHandle.getIds().split(",");
+        QueryWrapper.in("id", ids);
+        T save;
+        try {
+            // 通过反射获取model的真实类型
+            ParameterizedType pt = (ParameterizedType) this.getClass().getGenericSuperclass();
+            Class<T> clazz = (Class<T>) pt.getActualTypeArguments()[0];
+            // 通过反射创建model的实例
+            save = clazz.newInstance();
+            Class<? extends Object> clazzUpdate = save.getClass();
+            Method setDelFlg = clazzUpdate.getMethod("delFlg", Integer.class);
+            setDelFlg.invoke(save,0);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        boolean res = service.update(save,QueryWrapper);
+        if (!res) {
+            return AjaxResult.error("删除失败");
+        }
+        return AjaxResult.success(Constants.SUCCESS, res);
+    }
+
+
     @PostMapping("/add")
     public Object add(@Valid @RequestBody AddHandle<T> addHandle, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {

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

@@ -18,8 +18,8 @@ import com.mokamrp.privates.service.pangu.FosterwxCashWorkwxTaskCatalogService;
 import com.mokamrp.privates.service.pangu.FosterwxCashWorkwxTaskListService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.tomcat.jni.Local;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cglib.core.Local;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -30,7 +30,9 @@ 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.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.Map;
 import java.util.List;
 
@@ -73,6 +75,7 @@ public class FosterwxCashTaskTemplateController extends BaseController<FosterwxC
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
+        LocalDateTime now = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);
         ResHandle<List<FosterwxCashTaskTemplate>> res = fosterwxCashTaskTemplateService.getList(postBasePageHandle);
         return AjaxResult.success(res);
     }
@@ -155,7 +158,7 @@ public class FosterwxCashTaskTemplateController extends BaseController<FosterwxC
             for (FosterwxCashWorkwxTaskList fosterwxCashWorkwxTaskList : fosterwxCashWorkwxTaskCatalog.getTaskList()){
                 //.保存任务目录内任务列表
                 fosterwxCashWorkwxTaskList.setTemplateId(add.getId());
-                fosterwxCashWorkwxTaskList.setCatalogId(fosterwxCashWorkwxTaskList.getId());
+                fosterwxCashWorkwxTaskList.setCatalogId(fosterwxCashWorkwxTaskCatalog.getId());
                 fosterwxCashWorkwxTaskList.setCreateAt(LocalDateTime.now());
                 fosterwxCashWorkwxTaskList.setUpdateAt(LocalDateTime.now());
                 fosterwxCashWorkwxTaskList.setCreateUid(authUser.getId());

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

@@ -1,9 +1,14 @@
 package com.mokamrp.privates.controller.pangu;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.mokamrp.privates.constant.Constants;
 import com.mokamrp.privates.constant.HttpStatus;
+import com.mokamrp.privates.entity.AddHandle;
+import com.mokamrp.privates.entity.DelHandle;
 import com.mokamrp.privates.entity.PostBasePageHandle;
 import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.entity.ResHandle;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashTaskTemplate;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
@@ -15,6 +20,7 @@ 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.time.LocalDateTime;
 import java.util.Map;
 import java.util.List;
 
@@ -31,7 +37,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @Api(tags = "企微变现任务目录")
-@RequestMapping("/fosterwxCashWorkwxTaskCatalog")
+@RequestMapping("/pangu/fosterwxCashWorkwxTaskCatalog")
 public class FosterwxCashWorkwxTaskCatalogController extends BaseController<FosterwxCashWorkwxTaskCatalog> {
 
     @Autowired
@@ -52,6 +58,21 @@ public class FosterwxCashWorkwxTaskCatalogController extends BaseController<Fost
         return AjaxResult.success(res);
     }
 
+    @PostMapping("/add")
+    public Object add(@Valid @RequestBody AddHandle<FosterwxCashWorkwxTaskCatalog> addHandle, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        FosterwxCashWorkwxTaskCatalog save = addHandle.getRaw();
+        this.onInsert(save);
+        Boolean res = service.save(save);
+        if (res) {
+            return AjaxResult.success(Constants.SUCCESS, save.getId());
+        } else {
+            return AjaxResult.error("新增失败", res);
+        }
+    }
+
 
 }
 

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

@@ -38,7 +38,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @Api(tags = "企微变现任务列表")
-@RequestMapping("/fosterwxCashWorkwxTaskList")
+@RequestMapping("/pangu/fosterwxCashWorkwxTaskList")
 public class FosterwxCashWorkwxTaskListController extends BaseController<FosterwxCashWorkwxTaskList> {
 
     @Autowired

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

@@ -14,6 +14,8 @@ public class PostBasePageHandle {
     private String title;
     private String name;
     private Integer type;
+    private Integer templateId;
+    private Integer catalogId;
     public Integer getPage() {
         return page;
     }

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

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

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

@@ -21,6 +21,9 @@
     </sql>
     <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskCatalog">
         SELECT * FROM pan_fosterwx_cash_workwx_task_catalog
+        <where>
+            <if test="params.templateId != null">and template_id = #{params.templateId}</if>
+        </where>
     </select>
     <select id="getTaskByTemplateId"
             resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskList">
@@ -29,6 +32,8 @@
                B.*
         from pan_fosterwx_cash_workwx_task_catalog as A
         left join pan_fosterwx_cash_workwx_task_list as B on A.id = B.catalog_id
+        where A.del_flg = 1
+        and A.template_id = #{templateId}
         order by send_at desc
     </select>
 </mapper>

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

@@ -1,5 +1,6 @@
 package com.mokamrp.privates.mapper.pangu;
 
+import com.mokamrp.privates.entity.PostBasePageHandle;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskList;
 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 FosterwxCashWorkwxTaskListMapper extends BaseMapper<FosterwxCashWorkwxTaskList> {
-    public List<FosterwxCashWorkwxTaskList> getList(Page<FosterwxCashWorkwxTaskList> pageObj);
+    public List<FosterwxCashWorkwxTaskList> getList(Page<FosterwxCashWorkwxTaskList> pageObj, @Param("params")PostBasePageHandle handle);
 }

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

@@ -41,5 +41,9 @@
     </sql>
     <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskList">
         SELECT *  FROM pan_fosterwx_cash_workwx_task_list
+        <where>
+            <if test="params.templateId != null">and template_id = #{params.templateId}</if>
+            <if test="params.catalogId != null">and catalog_id = #{params.catalogId}</if>
+        </where>
     </select>
 </mapper>

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

@@ -35,7 +35,7 @@ public class FosterwxCashWorkwxTaskCatalogServiceImpl extends ServiceImpl<Foster
         Integer pagesize = handle.getPagesize();
         Integer page = handle.getPage();
         Page<FosterwxCashWorkwxTaskCatalog> pageObj = new Page<FosterwxCashWorkwxTaskCatalog>(page, pagesize);
-        List<FosterwxCashWorkwxTaskCatalog> list = fosterwxCashWorkwxTaskCatalogMapper.getList(pageObj);
+        List<FosterwxCashWorkwxTaskCatalog> list = fosterwxCashWorkwxTaskCatalogMapper.getList(pageObj,handle);
         ResHandle<List<FosterwxCashWorkwxTaskCatalog>> res = new ResHandle<>();
         res.setList(list);
         res.setTotal(pageObj.getTotal());

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

@@ -35,7 +35,7 @@ public class FosterwxCashWorkwxTaskListServiceImpl extends ServiceImpl<FosterwxC
         Integer pagesize = handle.getPagesize();
         Integer page = handle.getPage();
         Page<FosterwxCashWorkwxTaskList> pageObj = new Page<FosterwxCashWorkwxTaskList>(page, pagesize);
-        List<FosterwxCashWorkwxTaskList> list = fosterwxCashWorkwxTaskListMapper.getList(pageObj);
+        List<FosterwxCashWorkwxTaskList> list = fosterwxCashWorkwxTaskListMapper.getList(pageObj,handle);
         ResHandle<List<FosterwxCashWorkwxTaskList>> res = new ResHandle<>();
         res.setList(list);
         res.setTotal(pageObj.getTotal());