删除不必要的引用

base-manager/src/main/java/com/mortals/xhx/base/system/role/web/RoleController.java

@@ -7,7 +7,6 @@ import com.mortals.framework.common.code.UserType;
 import com.mortals.framework.model.Context;
 
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.role.model.RoleQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

base-manager/src/main/java/com/mortals/xhx/module/holiday/web/HolidayController.java

@@ -2,7 +2,6 @@ package com.mortals.xhx.module.holiday.web;
 
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.holiday.model.HolidayEntity;
 import com.mortals.xhx.module.holiday.service.HolidayService;

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterAcceptController.java

@@ -4,7 +4,6 @@ import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.matter.model.MatterAcceptEntity;
 import com.mortals.xhx.module.matter.service.MatterAcceptService;

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterChargesController.java

@@ -4,7 +4,6 @@ import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.matter.model.MatterChargesEntity;
 import com.mortals.xhx.module.matter.service.MatterChargesService;

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterController.java

@@ -11,7 +11,6 @@ import com.mortals.framework.model.Result;
 import com.mortals.framework.util.DataUtil;
 import com.mortals.framework.util.ThreadPool;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.framework.config.InterceptorConfig;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.code.JointInfoShowEnum;

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterDatumController.java

@@ -7,7 +7,6 @@ import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.matter.model.MatterDatumEntity;
 import com.mortals.xhx.module.matter.model.MatterDatumFileEntity;

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterDatumFileController.java

@@ -4,7 +4,6 @@ import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.matter.model.MatterDatumFileEntity;
 import com.mortals.xhx.module.matter.service.MatterDatumFileService;

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterFlowlimitController.java

@@ -4,7 +4,6 @@ import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.matter.model.MatterFlowlimitEntity;
 import com.mortals.xhx.module.matter.service.MatterFlowlimitService;

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterIntermediaryController.java

@@ -4,7 +4,6 @@ import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.matter.model.MatterIntermediaryEntity;
 import com.mortals.xhx.module.matter.service.MatterIntermediaryService;

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterQuestionController.java

@@ -4,7 +4,6 @@ import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.matter.model.MatterQuestionEntity;
 import com.mortals.xhx.module.matter.service.MatterQuestionService;

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterSetbaseController.java

@@ -4,7 +4,6 @@ import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.matter.model.MatterSetbaseEntity;
 import com.mortals.xhx.module.matter.service.MatterSetbaseService;

base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteMatterController.java

@@ -7,7 +7,6 @@ import com.mortals.framework.model.Context;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.util.ThreadPool;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.code.SourceEnum;
 import com.mortals.xhx.common.code.YesNoEnum;

base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteModelController.java

 package com.mortals.xhx.module.site.web;
 
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.site.model.SiteModelEntity;
 import com.mortals.xhx.module.site.service.SiteModelService;

base-manager/src/main/java/com/mortals/xhx/module/skin/service/impl/SkinTemplateServiceImpl.java

@@ -41,25 +41,6 @@ public class SkinTemplateServiceImpl extends AbstractCRUDServiceImpl<SkinTemplat
         });
 
         super.findAfter(params, pageInfo, context, list);
-    }
-
-    /**
-     * @param entity
-     * @param context
-     * @throws AppException
-     */
-    @Override
-    protected void updateBefore(SkinTemplateEntity entity, Context context) throws AppException {
-        super.updateBefore(entity, context);
-        //更新前判断字段是否更新，如果更新则同步更新已有的模板属性
-  /*      SkinTemplateEntity localEntity = this.get(entity.getId(), context);
-        if(!ObjectUtils.isEmpty(localEntity)){
-
-        }*/
-
-
-
-
     }
 
     @Override

base-manager/src/main/java/com/mortals/xhx/module/sms/web/SmsSetController.java

@@ -4,7 +4,6 @@ import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.sms.model.SmsSetEntity;
 import com.mortals.xhx.module.sms.service.SmsSetService;

base-manager/src/main/java/com/mortals/xhx/module/sms/web/SmsTemplateController.java

@@ -2,7 +2,6 @@ package com.mortals.xhx.module.sms.web;
 
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.sms.model.SmsTemplateEntity;
 import com.mortals.xhx.module.sms.service.SmsTemplateService;

base-manager/src/main/java/com/mortals/xhx/module/window/web/WindowBusinessController.java

 package com.mortals.xhx.module.window.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.util.DataUtil;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.window.model.WindowBusinessEntity;
 import com.mortals.xhx.module.window.service.WindowBusinessService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * 窗口业务
  *

base-manager/src/main/java/com/mortals/xhx/module/window/web/WindowController.java

@@ -9,16 +9,13 @@ import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
 import com.mortals.framework.util.DataUtil;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.dept.model.DeptEntity;
 import com.mortals.xhx.module.dept.model.DeptQuery;
 import com.mortals.xhx.module.dept.service.DeptService;
-import com.mortals.xhx.module.matter.model.MatterEntity;
 import com.mortals.xhx.module.site.model.SiteEntity;
 import com.mortals.xhx.module.site.service.SiteService;
 import com.mortals.xhx.module.window.model.WindowEntity;
-import com.mortals.xhx.module.window.service.WindowBusinessService;
 import com.mortals.xhx.module.window.service.WindowService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,7 +29,6 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import static com.mortals.framework.ap.SysConstains.MESSAGE_INFO;
 import static com.mortals.framework.ap.SysConstains.PAGEINFO_KEY;

base-manager/src/main/java/com/mortals/xhx/module/window/web/WindowMatterController.java

@@ -2,18 +2,13 @@ package com.mortals.xhx.module.window.web;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.ap.GlobalSysInfo;
-import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.util.HttpUtil;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
-import com.mortals.xhx.common.code.YesNoEnum;
-import com.mortals.xhx.feign.rsp.ApiResp;
 import com.mortals.xhx.module.window.model.WindowMatterEntity;
 import com.mortals.xhx.module.window.service.WindowMatterService;
 import lombok.extern.slf4j.Slf4j;

base-manager/src/test/java/com/mortals/httpclient/skin/SkinBaseController.http

@@ -36,7 +36,7 @@ client.global.set("SkinBase_id", JSON.parse(response.body).data.id);
 %}
 
 ###系统基础皮肤查看
-GET {{baseUrl}}/skin/base/interview?id=160
+GET {{baseUrl}}/skin/base/interview?id=93
 Accept: application/json
 
 ###系统基础皮肤编辑