init: init project step4: biz code support

hnqz-visual/hnqz-daemon-quartz/src/main/java/com/qunzhixinxi/hnqz/daemon/quartz/controller/WmTaskTypeController.java

@@ -3,6 +3,7 @@ package com.qunzhixinxi.hnqz.daemon.quartz.controller;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.qunzhixinxi.hnqz.common.core.constant.CommonConstants;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
@@ -13,6 +14,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 
 /**
@@ -23,18 +25,19 @@ import java.time.LocalDateTime;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("/wmtasktype" )
+@RequestMapping("/wmtasktype")
 public class WmTaskTypeController {
 
     private final WmTaskTypeService wmTaskTypeService;
 
     /**
      * 分页查询
-     * @param page 分页对象
+     *
+     * @param page       分页对象
      * @param wmTaskType 任务类型打分表
      * @return
      */
-    @GetMapping("/page" )
+    @GetMapping("/page")
     public R getWmTaskTypePage(Page page, WmTaskType wmTaskType) {
         return R.ok(wmTaskTypeService.page(page, Wrappers.query(wmTaskType)));
     }
@@ -42,74 +45,77 @@ public class WmTaskTypeController {
 
     /**
      * 通过id查询任务类型打分表
+     *
      * @param id id
      * @return R
      */
-    @GetMapping("/{id}" )
-    public R getById(@PathVariable("id" ) Integer id) {
+    @GetMapping("/{id}")
+    public R getById(@PathVariable("id") Integer id) {
         return R.ok(wmTaskTypeService.getById(id));
     }
 
     /**
      * 新增任务类型打分表
+     *
      * @param wmTaskType 任务类型打分表
      * @return R
      */
-    @SysLog("新增任务类型打分表" )
+    @SysLog("新增任务类型打分表")
     @PostMapping
     public R save(@RequestBody WmTaskType wmTaskType) {
-		wmTaskType.setCreateTime(LocalDateTime.now());
-		if(SecurityUtils.getRoles().contains(2))
-		{
-			wmTaskType.setStatus("0");
-		}else{
-			wmTaskType.setStatus("1");
-		}
-    	return R.ok(wmTaskTypeService.save(wmTaskType));
+        wmTaskType.setCreateTime(LocalDateTime.now());
+        if (SecurityUtils.getRoles().contains(2)) {
+            wmTaskType.setStatus("0");
+        } else {
+            wmTaskType.setStatus("1");
+        }
+        return R.ok(wmTaskTypeService.save(wmTaskType));
     }
 
     /**
      * 修改任务类型打分表
+     *
      * @param wmTaskType 任务类型打分表
      * @return R
      */
-    @SysLog("修改任务类型打分表" )
+    @SysLog("修改任务类型打分表")
     @PutMapping
     public R updateById(@RequestBody WmTaskType wmTaskType) {
-		if(SecurityUtils.getRoles().contains(2))
-		{
-			WmTaskType wmTaskRule1=wmTaskType;
-			wmTaskRule1.setId(null);
-			wmTaskRule1.setStatus("1");
-			wmTaskTypeService.save(wmTaskRule1);
-		}else{
-			wmTaskTypeService.updateById(wmTaskType);
-		}
-    	return R.ok();
+        if (SecurityUtils.getRoles().contains(2)) {
+            WmTaskType wmTaskRule1 = wmTaskType;
+            wmTaskRule1.setId(null);
+            wmTaskRule1.setStatus("1");
+            wmTaskTypeService.save(wmTaskRule1);
+        } else {
+            wmTaskTypeService.updateById(wmTaskType);
+        }
+        return R.ok();
     }
 
     /**
      * 通过id删除任务类型打分表
+     *
      * @param id id
      * @return R
      */
-    @SysLog("通过id删除任务类型打分表" )
-    @DeleteMapping("/{id}" )
-    @PreAuthorize("@pms.hasPermission('admin_wmtasktype_del')" )
-    public R removeById(@PathVariable Integer id) {
+    @SysLog("通过id删除任务类型打分表")
+    @DeleteMapping("/{id}")
+    @PreAuthorize("@pms.hasPermission('admin_wmtasktype_del')")
+    public R<Boolean> removeById(@PathVariable Integer id) {
         return R.ok(wmTaskTypeService.removeById(id));
     }
 
-	/**
-	 * 获取药企列表
-	 * @return 角色列表
-	 */
-	@GetMapping("/list")
-	public R listWmScorePackage() {
-		WmTaskType wmDaDrugEnt=new WmTaskType();
-		wmDaDrugEnt.setDelFlag("0");
-		wmDaDrugEnt.setEnableFlag("0");
-		wmDaDrugEnt.setTaskTypeLevel("1");
-		return R.ok(wmTaskTypeService.list(Wrappers.query(wmDaDrugEnt)));
-	}
+    /**
+     * 获取药企列表
+     *
+     * @return 角色列表
+     */
+    @GetMapping("/list")
+    public R<List<WmTaskType>> listWmScorePackage() {
+        WmTaskType wmDaDrugEnt = new WmTaskType();
+        wmDaDrugEnt.setDelFlag(CommonConstants.STATUS_NORMAL);
+        wmDaDrugEnt.setEnableFlag(CommonConstants.STATUS_NORMAL);
+        wmDaDrugEnt.setTaskTypeLevel("1");
+        return R.ok(wmTaskTypeService.list(Wrappers.query(wmDaDrugEnt)));
+    }
 }

hnqz-visual/hnqz-daemon-quartz/src/main/java/com/qunzhixinxi/hnqz/daemon/quartz/entity/WmTaskType.java

@@ -3,10 +3,9 @@ package com.qunzhixinxi.hnqz.daemon.quartz.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
@@ -17,9 +16,8 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("wm_task_type")
-@EqualsAndHashCode(callSuper = true)
-public class WmTaskType extends Model<WmTaskType> {
-private static final long serialVersionUID = 1L;
+public class WmTaskType implements Serializable {
+    private static final long serialVersionUID = 1L;
 
 
     @TableId
@@ -33,31 +31,30 @@ private static final long serialVersionUID = 1L;
      */
     private String taskTypeLevel;
 
+    /**
+     * 规则类型，1药企 2一级代理商
+     */
+    private String status;
 
-	/**
-	 * 规则类型，1药企 2一级代理商
-	 */
-	private String status;
-
-	/**
-	 * 药企ID
-	 */
-	private String durgentId;
+    /**
+     * 药企ID
+     */
+    private Integer durgentId;
 
-	/**
-	 * 药企ID
-	 */
-	private String level1Id;
+    /**
+     * 药企ID
+     */
+    private String level1Id;
 
-	/**
-	 * 药企ID
-	 */
-	private String taskEntId;
+    /**
+     * 药企ID
+     */
+    private String taskEntId;
 
-	/**
-	 * 完成后可获得分
-	 */
-	private Integer score;
+    /**
+     * 完成后可获得分
+     */
+    private Integer score;
     /**
      * 积分范围开始
      */
@@ -101,4 +98,4 @@ private static final long serialVersionUID = 1L;
 
 
     private String baseId;
-    }
+}