Merge remote-tracking branch 'origin/master'

agent-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthTokenServiceImpl.java

@@ -106,9 +106,9 @@ public class AuthTokenServiceImpl implements IAuthTokenService {
                 String uuid = (String) claims.get(SysConstains.LOGIN_USER_KEY);
                 String userKey = getTokenKey(uuid);
                 //cacheService.select(portalDb);
-                // String userStr = cacheService.get(userKey);
-                RedisTemplate<String, String> redisTemplate = cacheService.selectDbRedisTemplate(portalDb);
-                String userStr =redisTemplate.opsForValue().get(userKey);
+                 String userStr = cacheService.get(userKey);
+               // RedisTemplate<String, String> redisTemplate = cacheService.selectDbRedisTemplate(portalDb);
+               // String userStr =redisTemplate.opsForValue().get(userKey);
 
                 //刷新token时间
                 UserEntity userEntity = JSONObject.parseObject(userStr, UserEntity.class);

agent-manager/src/main/java/com/mortals/xhx/module/category/web/CategoryController.java

@@ -34,8 +34,6 @@ import com.mortals.xhx.common.code.*;
 @RequestMapping("category")
 public class CategoryController extends BaseCRUDJsonBodyMappingController<CategoryService,CategoryEntity,Long> {
 
-    @Autowired
-    private ParamService paramService;
 
     public CategoryController(){
         super.setModuleDesc( "事项分类");

agent-manager/src/main/java/com/mortals/xhx/module/declare/service/impl/DeclareServiceImpl.java

@@ -145,7 +145,10 @@ public class DeclareServiceImpl extends AbstractCRUDServiceImpl<DeclareDao, Decl
         if(between > 30) throw new AppException("超过30分钟无法取消申报！");
         if(declareEntity.getDeclareStatus() != DeclareStatusEnum.草稿.getValue()) throw new AppException("当前申报不是草稿状态，不能撤销！");
 
-
+        declareEntity.setDeclareStatus(DeclareStatusEnum.撤销.getValue());
+        declareEntity.setUpdateTime(new Date());
+        declareEntity.setUpdateUserId(this.getContextUserId(context));
+        this.update(declareEntity, context);
         return Rest.ok("取消申报成功！");
     }
 }
\ No newline at end of file

agent-manager/src/main/java/com/mortals/xhx/module/declare/web/DeclareController.java

@@ -2,10 +2,12 @@ package com.mortals.xhx.module.declare.web;
 
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.common.code.DeclareStatusEnum;
+import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.module.declare.model.*;
 import com.mortals.xhx.module.declare.service.DeclareFinImagesService;
 import com.mortals.xhx.module.declare.service.DeclareImagesService;
@@ -65,9 +67,10 @@ public class DeclareController extends BaseCRUDJsonBodyMappingController<Declare
         JSONObject jsonObject = new JSONObject();
         String busiDesc = "申报撤销" + this.getModuleDesc();
         try {
-
-
-
+            Rest<String> rest = this.service.declareCancel(query, getContext());
+            if(YesNoEnum.NO.getValue()==rest.getCode()){
+                throw new AppException(rest.getMsg());
+            }
             jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
             jsonObject.put(KEY_RESULT_MSG, "申报撤销成功！");
         } catch (Exception e) {

agent-manager/src/main/resources/config/mybatis-sqlmap-config.xml

@@ -18,8 +18,8 @@
 		</plugin>
 
 		<plugin interceptor="com.mortals.framework.thirty.mybatis.LogInterceptor">
-			<property name="enableExecutorTime" value="false" />
-			<property name="showSql" value="false" />
+			<property name="enableExecutorTime" value="true" />
+			<property name="showSql" value="true" />
 		</plugin>
 	</plugins>
 </configuration>
\ No newline at end of file

agent-manager/src/test/java/com/mortals/httpclient/category/CategoryController.http

@@ -14,7 +14,7 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 %}
 
 ###事项分类列表
-POST {{baseUrl}}/category/list
+POST {{baseUrl}}/category/interlist
 Content-Type: application/json
 
 {

agent-manager/src/test/java/com/mortals/httpclient/declare/DeclareController.http

@@ -14,7 +14,7 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 %}
 
 ###企业代办申报列表
-POST {{baseUrl}}/declare/list
+POST {{baseUrl}}/declare/interlist
 Content-Type: application/json
 
 {

agent-manager/src/test/java/com/mortals/httpclient/http-client.env.json

@@ -8,7 +8,7 @@
     "baseLogin": "http://192.168.0.98:11078/base"
   },
   "product": {
-    "baseUrl": "http://192.168.0.252:11078/agent"
+    "baseUrl": "http://192.168.0.252:11089/agent"
   }