Merge branch 'feature/dinas_type' into develop

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/config/DinasTypeConfiguration.java

@@ -4,7 +4,6 @@ import com.beecode.amino.metadata.runtime.MetadataMech;
 import com.beecode.bcp.type.KClass;
 import com.beecode.bcp.type.TypeConstants;
 import com.xyst.dinas.biz.constant.DinasTypeConstant;
-import com.xyst.dinas.biz.constant.StationConstant;
 import com.xyst.dinas.biz.internal.dao.DinasTypeDaoImpl;
 import com.xyst.dinas.biz.internal.service.DinasTypeServiceImpl;
 import com.xyst.dinas.biz.web.DinasTypeController;

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/config/StationConfiguration.java

@@ -4,20 +4,18 @@ import com.beecode.amino.metadata.runtime.MetadataMech;
 import com.beecode.bcp.type.KClass;
 import com.beecode.bcp.type.TypeConstants;
 import com.xyst.dinas.biz.constant.StationConstant;
+import com.xyst.dinas.biz.dao.PositionDao;
 import com.xyst.dinas.biz.internal.StationInfoQueryProcessor;
+import com.xyst.dinas.biz.internal.dao.PositionDaoImpl;
 import com.xyst.dinas.biz.internal.dao.StationDaoImpl;
+import com.xyst.dinas.biz.internal.service.PositionServiceImpl;
 import com.xyst.dinas.biz.internal.service.StationServiceImpl;
+import com.xyst.dinas.biz.service.PositionService;
+import com.xyst.dinas.biz.web.PositionController;
 import com.xyst.dinas.biz.web.StationController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
-
-import com.xyst.dinas.biz.dao.PositionDao;
-import com.xyst.dinas.biz.internal.StationInfoQueryProcessor;
-import com.xyst.dinas.biz.internal.dao.PositionDaoImpl;
-import com.xyst.dinas.biz.internal.service.PositionServiceImpl;
-import com.xyst.dinas.biz.service.PositionService;
-import com.xyst.dinas.biz.web.PositionController;
 import org.springframework.core.io.ClassPathResource;
 
 public class StationConfiguration {

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/dao/DinasTypeDaoImpl.java

@@ -14,7 +14,6 @@ import org.hibernate.query.NativeQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.orm.hibernate5.HibernateTemplate;
 
-import java.math.BigInteger;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/web/DinasTypeController.java

@@ -24,14 +24,14 @@ public class DinasTypeController {
     private DinasTypeService dinasTypeService;
 
     @RequestMapping(value = "list/page", method = RequestMethod.GET)
-    public Page<KObject> getStaffByRole(
+    public ResponseObj getDinasTypeList(
             @RequestParam(name = "pageNo", required = false) Integer pageNo,
             @RequestParam(name = "pageSize", required = false) Integer pageSize) throws Exception {
 
         Page<KObject> objectPage = new Page<>();
         objectPage.setPageNo(pageNo);
         objectPage.setPageSize(pageSize);
-        return dinasTypeService.queryByPaging(objectPage);
+        return ResponseObj.success("操作成功",dinasTypeService.queryByPaging(objectPage));
     }
 
     /**
@@ -89,7 +89,7 @@ public class DinasTypeController {
      * @return
      */
     @DeleteMapping("/{id}")
-    public ResponseObj<Object> deleteMemberByStaffId(@PathVariable("id") UUID id){
+    public ResponseObj<Object> deleteById(@PathVariable("id") UUID id){
         if(id == null){
             return ResponseObj.error(400,"'id' must be not null!");
         }

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/web/StationController.java

@@ -5,23 +5,15 @@ import com.beecode.bap.attachment.common.Page;
 import com.beecode.bcp.type.KClass;
 import com.beecode.bcp.type.KObject;
 import com.beecode.bcp.type.json.JSONObjectUtils;
-import com.beecode.inz.basis.team.entity.OperationTeam;
 import com.beecode.inz.basis.team.pojo.ResponseObj;
-import com.beecode.inz.message.internal.QueryParam;
-import com.beecode.inz.message.remind.RemindSettingsInfo;
-import com.beecode.inz.workflow.constants.InzWorkflowDefinitionConstants;
 import com.beecode.nlib.utils.StringUtils;
-import com.google.gson.Gson;
-import com.google.gson.JsonSyntaxException;
 import com.xyst.dinas.biz.constant.StationConstant;
-import com.xyst.dinas.biz.entity.Station;
 import com.xyst.dinas.biz.service.StationService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
 import java.util.UUID;
 
 /**
@@ -41,7 +33,7 @@ public class StationController {
 
 
     @RequestMapping(value = "list/page", method = RequestMethod.GET)
-    public ResponseObj getStaffByRole(
+    public ResponseObj getListPage(
                                           @RequestParam(name = "pageNo", required = false) Integer pageNo,
                                           @RequestParam(name = "pageSize", required = false) Integer pageSize) throws Exception {
 
@@ -135,7 +127,7 @@ public class StationController {
      * @return
      */
     @DeleteMapping("/{id}")
-    public ResponseObj deleteMemberByStaffId(@PathVariable("id") UUID id){
+    public ResponseObj deleteById(@PathVariable("id") UUID id){
         if(id == null){
             return ResponseObj.error(400,"'id' must be not null!");
         }