【融通小程序】任务文件

src/main/java/com/ebei/device/asset/weixin/contorller/AssetTaskController.java

@@ -1,19 +1,15 @@
-package com.ebei.device.weixin.controller;
+package com.ebei.device.asset.weixin.contorller;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.ebei.device.base.controller.BaseController;
-import com.ebei.device.common.util.ResponsePageEx;
-import com.ebei.device.weixin.model.vo.AssetHistoryTask;
-import com.ebei.device.weixin.service.AssetTaskService;
+import com.ebei.device.asset.weixin.model.vo.AssetHistoryTask;
+import com.ebei.device.asset.weixin.service.AssetTaskService;
+import com.ebei.device.asset.weixin.util.ResponsePageEx;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -25,7 +21,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("/assetTask")
 @Api(value = "assetTask", description = "资产任务")
-public class AssetTaskController extends BaseController {
+public class AssetTaskController {
 
 
     @Autowired
@@ -39,9 +35,9 @@ public class AssetTaskController extends BaseController {
             @ApiImplicitParam(name = "tenantId", value = "租户Id", required = true, paramType = "query"),
             @ApiImplicitParam(name = "assetId", value = "资产Id", required = true, paramType = "query")
     })
-    @PostMapping("/selectAssetTaskList")
+    @GetMapping("/selectAssetTaskList")
     public ResponsePageEx<Object> selectAssetTaskList(@RequestParam(required = false) Integer pageSize, @RequestParam(required = false) Integer pageIndex,
-                                                            @RequestParam Long tenantId, @RequestParam Long assetId) {
+                                                      @RequestParam Long tenantId, @RequestParam Long assetId) {
 
         Page<AssetHistoryTask> page = new Page<>(pageIndex == null ? 1 : pageIndex, pageSize == null ? Integer.MAX_VALUE : pageSize);
         Map<String,Object> params = new HashMap<>();

src/main/java/com/ebei/device/asset/weixin/mapper/AssetTaskMapper.java

@@ -1,9 +1,9 @@
-package com.ebei.device.weixin.mapper;
+package com.ebei.device.asset.weixin.mapper;
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.ebei.device.weixin.model.entity.AssetTask;
-import com.ebei.device.weixin.model.vo.AssetHistoryTask;
+import com.ebei.device.asset.weixin.model.entity.AssetTask;
+import com.ebei.device.asset.weixin.model.vo.AssetHistoryTask;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/ebei/device/asset/weixin/model/entity/AssetTask.java

@@ -1,4 +1,4 @@
-package com.ebei.device.weixin.model.entity;
+package com.ebei.device.asset.weixin.model.entity;
 
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableField;

src/main/java/com/ebei/device/asset/weixin/model/vo/AssetHistoryTask.java

@@ -1,4 +1,4 @@
-package com.ebei.device.weixin.model.vo;
+package com.ebei.device.asset.weixin.model.vo;
 
 import com.baomidou.mybatisplus.activerecord.Model;
 import io.swagger.annotations.ApiModel;

src/main/java/com/ebei/device/asset/weixin/service/AssetTaskService.java

@@ -1,9 +1,10 @@
-package com.ebei.device.weixin.service;
+package com.ebei.device.asset.weixin.service;
+
 
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.IService;
-import com.ebei.device.weixin.model.entity.AssetTask;
-import com.ebei.device.weixin.model.vo.AssetHistoryTask;
+import com.ebei.device.asset.weixin.model.entity.AssetTask;
+import com.ebei.device.asset.weixin.model.vo.AssetHistoryTask;
 
 import java.util.Map;
 
@@ -13,6 +14,6 @@ import java.util.Map;
  */
 public interface AssetTaskService extends IService<AssetTask> {
 
-    Page<AssetHistoryTask> selectAssetTaskList(Page<AssetHistoryTask> page, Map<String,Object> params);
+    Page<AssetHistoryTask> selectAssetTaskList(Page<AssetHistoryTask> page, Map<String, Object> params);
 
 }

src/main/java/com/ebei/device/asset/weixin/service/impl/AssetTaskServiceImpl.java

@@ -1,12 +1,12 @@
-package com.ebei.device.weixin.service.impl;
+package com.ebei.device.asset.weixin.service.impl;
 
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.ebei.device.base.auth.AuthUtils;
-import com.ebei.device.weixin.mapper.AssetTaskMapper;
-import com.ebei.device.weixin.model.entity.AssetTask;
-import com.ebei.device.weixin.model.vo.AssetHistoryTask;
-import com.ebei.device.weixin.service.AssetTaskService;
+import com.ebei.device.asset.weixin.auth.AuthUtils;
+import com.ebei.device.asset.weixin.mapper.AssetTaskMapper;
+import com.ebei.device.asset.weixin.model.entity.AssetTask;
+import com.ebei.device.asset.weixin.model.vo.AssetHistoryTask;
+import com.ebei.device.asset.weixin.service.AssetTaskService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

src/main/resources/mapper/AssetTaskMapper.xml

@@ -1,8 +1,8 @@
 <?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.ebei.device.weixin.mapper.AssetTaskMapper">
+<mapper namespace="com.ebei.device.asset.weixin.mapper.AssetTaskMapper">
 
-    <select id="selectAssetTaskList" resultType="com.ebei.device.weixin.model.vo.AssetHistoryTask">
+    <select id="selectAssetTaskList" resultType="com.ebei.device.asset.weixin.model.vo.AssetHistoryTask">
         SELECT
             task.task_id taskId,
             date_format(task.complete_time,'%Y-%m-%d') completeTime