Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>amos-boot-module-api</artifactId>
+    <groupId>com.amosframework.boot</groupId>
+    <version>1.0.0</version>
+  </parent>
+  <artifactId>amos-boot-module-common-api</artifactId>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>1.7</maven.compiler.source>
+    <maven.compiler.target>1.7</maven.compiler.target>
+  </properties>
+
+  <dependencies>
+  </dependencies>
+</project>

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/CbDemo.java

-package com.yeejoin.amos.boot.module.jcs.api.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
-
-import java.util.Date;
-
-/**
- * @author DELL
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("tb_demo")
-@ApiModel(value = "tb_demo对象", description = "Demo示例")
-public class CbDemo extends BaseEntity {
-
-	
-
-	@ApiModelProperty(value = "NAME")
-	private String name;
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/DemoMapper.java

-package com.yeejoin.amos.boot.module.jcs.api.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.boot.module.jcs.api.entity.CbDemo;
-/**
- * @Description: 示例代码
- * @Author: amos-boot-biz
- * @Date:  2021-05-27
- * @Version: V1.0
- */
-public interface DemoMapper extends BaseMapper<CbDemo>{
-    CbDemo selectOneBySeqNbr(Long seqNbr);
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IDemoService.java

-package com.yeejoin.amos.boot.module.jcs.api.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.yeejoin.amos.boot.module.jcs.api.entity.CbDemo;
-/**
- * <p>
- *示例 服务类
- * </p>
- *
- * @Author lichenglong
- * @since 2021-05-27
- */
-public interface IDemoService extends IService<CbDemo> {
-    public CbDemo selectOneBySeqNbr(Long seqNbr);
-}

amos-boot-module/amos-boot-module-api/pom.xml

@@ -18,5 +18,6 @@
   	<module>amos-boot-module-tzs-api</module>
   	<module>amos-boot-module-jcs-api</module>
       <module>amos-boot-module-demo-api</module>
+    <module>amos-boot-module-common-api</module>
   </modules>
-</project>
+</project>
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>amos-boot-module-biz</artifactId>
+    <groupId>com.amosframework.boot</groupId>
+    <version>1.0.0</version>
+  </parent>
+
+  <artifactId>amos-boot-module-common-biz</artifactId>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>1.7</maven.compiler.source>
+    <maven.compiler.target>1.7</maven.compiler.target>
+  </properties>
+
+  <dependencies>
+  </dependencies>
+</project>

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertCalledController.java

@@ -47,7 +47,7 @@ import java.util.stream.Stream;
  */
 @RestController
 @Api(tags = "警情接警记录Api")
-@RequestMapping(value = "/jcs/alert-called")
+@RequestMapping(value = "/alert-called")
 public class AlertCalledController extends BaseController {
 
     @Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertFormController.java

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
-import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
-import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import com.yeejoin.amos.boot.module.jcs.api.service.IAlertFormService;
-import com.yeejoin.amos.boot.module.jcs.api.vo.AlertFormVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.FormList;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertForm;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertForm;
+import com.yeejoin.amos.boot.module.jcs.api.service.IAlertFormService;
+import com.yeejoin.amos.boot.module.jcs.api.vo.AlertFormVo;
+import com.yeejoin.amos.boot.module.jcs.api.vo.FormList;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 
 
 /**
@@ -39,7 +42,7 @@ import java.util.List;
 */
 @RestController
 @Api(tags = "警情表单Api")
-@RequestMapping(value = "/jcs/alert-Form")
+@RequestMapping(value = "/alert-Form")
 public class AlertFormController extends BaseController {
 
     @Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertFormTypeController.java

@@ -29,7 +29,7 @@ import java.util.Arrays;
 */
 @RestController
 @Api(tags = "动态表单类型Api")
-@RequestMapping(value = "/jcs/alert-Form-type")
+@RequestMapping(value = "/alert-Form-type")
 public class AlertFormTypeController extends BaseController {
 
     @Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertFormValueController.java

@@ -29,7 +29,7 @@ import java.util.Arrays;
 */
 @RestController
 @Api(tags = "Api")
-@RequestMapping(value = "/jcs/alert-Form-value")
+@RequestMapping(value = "/alert-Form-value")
 public class AlertFormValueController extends BaseController {
 
     @Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertSubmittedController.java

@@ -35,7 +35,7 @@ import java.util.Arrays;
 */
 @RestController
 @Api(tags = "警情报送记录Api")
-@RequestMapping(value = "/jcs/alert-submitted")
+@RequestMapping(value = "/alert-submitted")
 public class AlertSubmittedController extends BaseController {
 
     @Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertSubmittedObjectController.java

@@ -29,7 +29,7 @@ import java.util.Arrays;
 */
 @RestController
 @Api(tags = "报送对象Api")
-@RequestMapping(value = "/jcs/alert-submitted-object")
+@RequestMapping(value = "/alert-submitted-object")
 public class AlertSubmittedObjectController extends BaseController {
 
     @Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/DataDictionaryController.java

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
-import com.alibaba.fastjson.JSON;
-import com.yeejoin.amos.boot.biz.common.utils.*;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertForm;
-import com.yeejoin.amos.boot.module.jcs.api.vo.FormList;
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-
-import com.yeejoin.amos.boot.module.jcs.api.service.IDataDictionaryService;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.utils.CommonResponseUtil;
+import com.yeejoin.amos.boot.biz.common.utils.Menu;
+import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
 import com.yeejoin.amos.boot.module.jcs.api.entity.DataDictionary;
+import com.yeejoin.amos.boot.module.jcs.api.service.IDataDictionaryService;
 
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 
 
 /**
@@ -38,7 +42,7 @@ import java.util.Map;
 */
 @RestController
 @Api(tags = "数据字典Api")
-@RequestMapping(value = "/jcs/data-dictionary")
+@RequestMapping(value = "/data-dictionary")
 public class DataDictionaryController extends BaseController {
 
     @Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/DemoController.java

-package com.yeejoin.amos.boot.module.jcs.biz.controller;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.biz.common.utils.CommonResponseUtil;
-import com.yeejoin.amos.boot.module.jcs.api.entity.CbDemo;
-import com.yeejoin.amos.boot.module.jcs.api.service.IDemoService;
-
-import java.util.List;
-
-/**
- * 示例控制类
- * @Author lichenglong
- * @since 2021-05-27
- */
-@RestController
-@RequestMapping("/demo")
-@Api(tags="示例")
-@Slf4j
-public class DemoController extends BaseController {
-	
-	@Autowired
-	private IDemoService demoService;
-
-    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/user")
-    @ApiOperation(value = "cs1")
-    public ResponseModel<Object> findUserList() {
-        List<CbDemo> lists = demoService.list();
-        return CommonResponseUtil.success(lists);
-    }
-
-    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/demo/{seqNbr}")
-    @ApiOperation(value = "cs2")
-    public ResponseModel findOneBySeqNbr(@PathVariable("seqNbr") Long seqNbr) {
-        CbDemo demo = demoService.selectOneBySeqNbr(seqNbr);
-        return CommonResponseUtil.success(demo);
-    }
-}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FireExpertsController.java

@@ -29,7 +29,7 @@ import java.util.Arrays;
 */
 @RestController
 @Api(tags = "Api")
-@RequestMapping(value = "/jcs/fire-experts")
+@RequestMapping(value = "/fire-experts")
 public class FireExpertsController extends BaseController {
 
     @Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FireTeamController.java

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
+
 import com.yeejoin.amos.boot.biz.common.utils.Menu;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -31,160 +32,149 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
 /**
-* 消防队伍
-*
-* @author tb
-* @date 2021-06-07
-*/
+ * 消防队伍
+ *
+ * @author tb
+ * @date 2021-06-07
+ */
 @RestController
 @Api(tags = "消防队伍Api")
-@RequestMapping(value = "/jcs/fire-team")
+@RequestMapping(value = "/fire-team")
 public class FireTeamController extends BaseController {
 
-    @Autowired
-    IFireTeamService iFireTeamService;
-
-    /**
-    * 新增消防队伍
-    * @return
-    */
-    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
-    @ApiOperation(httpMethod = "POST", value = "新增消防队伍", notes = "新增消防队伍")
-    public ResponseModel saveFireTeam(HttpServletRequest request, @RequestBody FireTeam fireTeam){
-        iFireTeamService.save(fireTeam);
-        return CommonResponseUtil.success();
-    }
-
-    /**
-    * 根据id删除
-    * @param id
-    * @return
-    */
-    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
-    @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
-    public ResponseModel deleteById(HttpServletRequest request, @PathVariable Long id){      
-        iFireTeamService.update(new UpdateWrapper<FireTeam>().eq("sequence_nbr", id).set("is_delete", 1));   
-    	return CommonResponseUtil.success();  	 
-    }
-
-
-
-
-    /**
-    * 修改消防队伍
-    * @return
-    */
-    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
-    @ApiOperation(httpMethod = "PUT", value = "修改消防队伍", notes = "修改消防队伍")
-    public ResponseModel updateByIdFireTeam(HttpServletRequest request, @RequestBody FireTeam fireTeam){
-    	boolean flag= iFireTeamService.updateById(fireTeam);
-    	return CommonResponseUtil.success();
-
-    }
-
-
-
-    /**
-    * 根据id查询
-    * @param id
-    * @return
-    */
-    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
-    @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
-    public ResponseModel selectById(HttpServletRequest request, @PathVariable Long id){
-        return CommonResponseUtil.success(iFireTeamService.getById(id));
-    }
-
-
-
-    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/getList", method = RequestMethod.GET)
-    @ApiOperation(httpMethod = "GET", value = "新列表分页查询", notes = "新表分页查询")
-    public ResponseModel getFirefighters(Integer pageNum,Integer pageSize, FireTeamListVo fireTeamList){
-         //条件分页
-    	 List<FireTeamVo> list= iFireTeamService.getFireTeam(pageNum, pageSize, fireTeamList);
-    	 Map<String, Long> num= iFireTeamService.getFireTeamCount(pageNum, pageSize, fireTeamList);   	
-    	 Page<FireTeamVo> pageBean =new Page<>(pageNum, pageSize,num.get("num"));
-    	 pageBean.setRecords(list);
-    	 return CommonResponseUtil.success(pageBean);  	 
-        } 
-    
-    
-    /**
-     * 列表分页查询
-     * @return
-     * @throws Exception 
-     */
-     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
-     @RequestMapping(value = "/listTree", method = RequestMethod.GET)
-     @ApiOperation(httpMethod = "GET", value = "队伍树", notes = "队伍树")
-     public ResponseModel listTree() throws Exception{
-    	 Map<String, Object> columnMap =new HashMap<>();
-     	 columnMap.put("is_delete", 0);  	
-     	Collection<FireTeam> list =iFireTeamService.listByMap(columnMap);
-     	FireTeam ll=new FireTeam();
-     	 //List<Menu> menus=TreeParser.getTree(null,list);  
-         List<Menu> menus= TreeParser.getTree(null, list,  FireTeam.class.getName(),"getSequenceNbr",2, "getName", "getParent");
-         return CommonResponseUtil.success(menus);  	
-     }
-
-    
-    
-    
-     
-    	
-    
-    /**
-    * 列表分页查询
-    * @return
-    */
-    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
-    public IPage<FireTeam> listPage(String pageNum,String pageSize, FireTeam fireTeam){
-
-        Page<FireTeam> pageBean;
-        QueryWrapper<FireTeam> fireTeamQueryWrapper = new QueryWrapper<>();
-        Class<? extends FireTeam> aClass = fireTeam.getClass();
-        Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
-            try {
-                field.setAccessible(true);
-                Object o = field.get(fireTeam);
-                if (o != null) {
-                    Class<?> type = field.getType();
-                    String name = NameUtils.camel2Underline(field.getName());
-                    if (type.equals(Integer.class)) {
-                        Integer fileValue = (Integer) field.get(fireTeam);
-                        fireTeamQueryWrapper.eq(name, fileValue);
-                    } else if (type.equals(Long.class)) {
-                        Long fileValue = (Long) field.get(fireTeam);
-                        fireTeamQueryWrapper.eq(name, fileValue);
-                    } else if (type.equals(String.class)) {
-                        String fileValue = (String) field.get(fireTeam);
-                        fireTeamQueryWrapper.eq(name, fileValue);
-                    } else {
-                        String fileValue = (String) field.get(fireTeam);
-                        fireTeamQueryWrapper.eq(name, fileValue);
-                    }
-                }
-            } catch (Exception e) {
-                throw  new RuntimeException("系统异常");
-            }
-        });
-        IPage<FireTeam> page;
-        if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
-            pageBean = new Page<>(0, Long.MAX_VALUE);
-        } else {
-            pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
-        }
-        page = iFireTeamService.page(pageBean, fireTeamQueryWrapper);
-            return page;
-        }
-    }
-
+	@Autowired
+	IFireTeamService iFireTeamService;
+
+	/**
+	 * 新增消防队伍
+	 * 
+	 * @return
+	 */
+	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/save", method = RequestMethod.POST)
+	@ApiOperation(httpMethod = "POST", value = "新增消防队伍", notes = "新增消防队伍")
+	public ResponseModel saveFireTeam(HttpServletRequest request, @RequestBody FireTeam fireTeam) {
+		iFireTeamService.save(fireTeam);
+		return CommonResponseUtil.success();
+	}
+
+	/**
+	 * 根据id删除
+	 * 
+	 * @param id
+	 * @return
+	 */
+	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
+	@ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
+	public ResponseModel deleteById(HttpServletRequest request, @PathVariable Long id) {
+		iFireTeamService.update(new UpdateWrapper<FireTeam>().eq("sequence_nbr", id).set("is_delete", 1));
+		return CommonResponseUtil.success();
+	}
+
+	/**
+	 * 修改消防队伍
+	 * 
+	 * @return
+	 */
+	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/updateById", method = RequestMethod.PUT)
+	@ApiOperation(httpMethod = "PUT", value = "修改消防队伍", notes = "修改消防队伍")
+	public ResponseModel updateByIdFireTeam(HttpServletRequest request, @RequestBody FireTeam fireTeam) {
+		boolean flag = iFireTeamService.updateById(fireTeam);
+		return CommonResponseUtil.success();
+
+	}
+
+	/**
+	 * 根据id查询
+	 * 
+	 * @param id
+	 * @return
+	 */
+	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/{id}", method = RequestMethod.GET)
+	@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
+	public ResponseModel selectById(HttpServletRequest request, @PathVariable Long id) {
+		return CommonResponseUtil.success(iFireTeamService.getById(id));
+	}
+
+	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/getList", method = RequestMethod.GET)
+	@ApiOperation(httpMethod = "GET", value = "新列表分页查询", notes = "新表分页查询")
+	public ResponseModel getFirefighters(Integer pageNum, Integer pageSize, FireTeamListVo fireTeamList) {
+		// 条件分页
+		List<FireTeamVo> list = iFireTeamService.getFireTeam(pageNum, pageSize, fireTeamList);
+		Map<String, Long> num = iFireTeamService.getFireTeamCount(pageNum, pageSize, fireTeamList);
+		Page<FireTeamVo> pageBean = new Page<>(pageNum, pageSize, num.get("num"));
+		pageBean.setRecords(list);
+		return CommonResponseUtil.success(pageBean);
+	}
+
+	/**
+	 * 列表分页查询
+	 * 
+	 * @return
+	 * @throws Exception
+	 */
+	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/listTree", method = RequestMethod.GET)
+	@ApiOperation(httpMethod = "GET", value = "队伍树", notes = "队伍树")
+	public ResponseModel<?> listTree() throws Exception {
+		Map<String, Object> columnMap = new HashMap<>();
+		columnMap.put("is_delete", 0);
+		Collection<FireTeam> list = iFireTeamService.listByMap(columnMap);
+		List<Menu> menus = TreeParser.getTree(null, list, FireTeam.class.getName(), "getSequenceNbr", 2, "getName",
+				"getParent");
+		return CommonResponseUtil.success(menus);
+	}
+
+	/**
+	 * 列表分页查询
+	 * 
+	 * @return
+	 */
+	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/list", method = RequestMethod.GET)
+	@ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
+	public IPage<FireTeam> listPage(String pageNum, String pageSize, FireTeam fireTeam) {
+
+		Page<FireTeam> pageBean;
+		QueryWrapper<FireTeam> fireTeamQueryWrapper = new QueryWrapper<>();
+		Class<? extends FireTeam> aClass = fireTeam.getClass();
+		Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
+			try {
+				field.setAccessible(true);
+				Object o = field.get(fireTeam);
+				if (o != null) {
+					Class<?> type = field.getType();
+					String name = NameUtils.camel2Underline(field.getName());
+					if (type.equals(Integer.class)) {
+						Integer fileValue = (Integer) field.get(fireTeam);
+						fireTeamQueryWrapper.eq(name, fileValue);
+					} else if (type.equals(Long.class)) {
+						Long fileValue = (Long) field.get(fireTeam);
+						fireTeamQueryWrapper.eq(name, fileValue);
+					} else if (type.equals(String.class)) {
+						String fileValue = (String) field.get(fireTeam);
+						fireTeamQueryWrapper.eq(name, fileValue);
+					} else {
+						String fileValue = (String) field.get(fireTeam);
+						fireTeamQueryWrapper.eq(name, fileValue);
+					}
+				}
+			} catch (Exception e) {
+				throw new RuntimeException("系统异常");
+			}
+		});
+		IPage<FireTeam> page;
+		if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
+			pageBean = new Page<>(0, Long.MAX_VALUE);
+		} else {
+			pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+		}
+		page = iFireTeamService.page(pageBean, fireTeamQueryWrapper);
+		return page;
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersContactsController.java

@@ -22,14 +22,14 @@ import java.util.Arrays;
 
 
 /**
-* l联系人
+* 联系人
 *
 * @author tb
 * @date 2021-06-07
 */
 @RestController
-@Api(tags = "l联系人Api")
-@RequestMapping(value = "/jcs/firefighters-contacts")
+@Api(tags = "联系人Api")
+@RequestMapping(value = "/firefighters-contacts")
 public class FirefightersContactsController extends BaseController {
 
     @Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersContractController.java

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import org.apache.commons.lang3.StringUtils;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
 
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import javax.servlet.http.HttpServletRequest;
 
-import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersContractService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContacts;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContract;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersThought;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContract;
+import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersContractService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 
 
 /**
@@ -36,7 +38,7 @@ import java.util.List;
 */
 @RestController
 @Api(tags = "消防员合同Api")
-@RequestMapping(value = "/jcs/firefighters-contract")
+@RequestMapping(value = "/firefighters-contract")
 public class FirefightersContractController extends BaseController {
 
     @Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersController.java

@@ -51,7 +51,7 @@ import java.util.Map;
 */
 @RestController
 @Api(tags = "消防队员Api")
-@RequestMapping(value = "/jcs/firefighters")
+@RequestMapping(value = "/firefighters")
 public class FirefightersController extends BaseController {
 
     @Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersEducationController.java

@@ -29,7 +29,7 @@ import java.util.Arrays;
 */
 @RestController
 @Api(tags = "人员学历Api")
-@RequestMapping(value = "/jcs/firefighters-education")
+@RequestMapping(value = "/firefighters-education")
 public class FirefightersEducationController extends BaseController {
 
     @Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersJacketController.java

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
+import java.util.Arrays;
+import java.util.Date;
+
+import javax.servlet.http.HttpServletRequest;
+
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-
-import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersJacketService;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContract;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersJacket;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import java.util.Arrays;
-import java.util.Date;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersJacket;
+import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersJacketService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 
 /**
  * 消防人员配装记录
@@ -33,7 +36,7 @@ import java.util.Date;
  */
 @RestController
 @Api(tags = "消防人员配装记录Api")
-@RequestMapping(value = "/jcs/firefighters-jacket")
+@RequestMapping(value = "/firefighters-jacket")
 public class FirefightersJacketController extends BaseController {
 
 	@Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersPostController.java

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersContactsService;
-import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersEducationService;
-import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersPostService;
-import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersWorkexperienceService;
-import com.yeejoin.amos.boot.module.jcs.api.vo.FirefightersData;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import java.util.Arrays;
+
+import javax.servlet.http.HttpServletRequest;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import javax.servlet.http.HttpServletRequest;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContacts;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContract;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.utils.CommonResponseUtil;
+import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersEducation;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersJacket;
 import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersPost;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersThought;
 import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersWorkexperience;
-import com.yeejoin.amos.boot.biz.common.utils.CommonResponseUtil;
-import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import java.util.Arrays;
+import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersContactsService;
+import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersEducationService;
+import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersPostService;
+import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersWorkexperienceService;
+import com.yeejoin.amos.boot.module.jcs.api.vo.FirefightersData;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 
 
 /**
@@ -44,7 +43,7 @@ import java.util.Arrays;
 */
 @RestController
 @Api(tags = "岗位信息Api")
-@RequestMapping(value = "/jcs/firefighters-post")
+@RequestMapping(value = "/firefighters-post")
 public class FirefightersPostController extends BaseController {
 
     @Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersThoughtController.java

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-
-import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersThoughtService;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContract;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersThought;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersThought;
+import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersThoughtService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 
 
 /**
@@ -36,7 +38,7 @@ import java.util.List;
 */
 @RestController
 @Api(tags = "消防员思想谈话记录Api")
-@RequestMapping(value = "/jcs/firefighters-thought")
+@RequestMapping(value = "/firefighters-thought")
 public class FirefightersThoughtController extends BaseController {
 
     @Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersWorkexperienceController.java

@@ -29,7 +29,7 @@ import java.util.Arrays;
 */
 @RestController
 @Api(tags = "工作经历Api")
-@RequestMapping(value = "/jcs/firefighters-workexperience")
+@RequestMapping(value = "/firefighters-workexperience")
 public class FirefightersWorkexperienceController extends BaseController {
 
     @Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/OrgUsrAuthController.java

@@ -29,7 +29,7 @@ import java.util.Arrays;
 */
 @RestController
 @Api(tags = "Api")
-@RequestMapping(value = "/jcs/org-usr-auth")
+@RequestMapping(value = "/org-usr-auth")
 public class OrgUsrAuthController extends BaseController {
 
     @Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/OrgUsrController.java

@@ -29,7 +29,7 @@ import java.util.Arrays;
 */
 @RestController
 @Api(tags = "机构/部门/人员表Api")
-@RequestMapping(value = "/jcs/org-usr")
+@RequestMapping(value = "/org-usr")
 public class OrgUsrController extends BaseController {
 
     @Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/PowerTransferCompanyController.java

@@ -31,7 +31,7 @@ import java.util.Arrays;
  */
 @RestController
 @Api(tags = "调派单位Api")
-@RequestMapping(value = "/jcs/power-transfer-company")
+@RequestMapping(value = "/power-transfer-company")
 public class PowerTransferCompanyController extends BaseController {
 
     @Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/PowerTransferCompanyResourcesController.java

@@ -31,7 +31,7 @@ import java.util.Arrays;
  */
 @RestController
 @Api(tags = "调派单位资源Api")
-@RequestMapping(value = "/jcs/power-transfer-company-resources")
+@RequestMapping(value = "/power-transfer-company-resources")
 public class PowerTransferCompanyResourcesController extends BaseController {
 
     @Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/PowerTransferController.java

@@ -33,7 +33,7 @@ import java.util.List;
  */
 @RestController
 @Api(tags = "力量调派Api")
-@RequestMapping(value = "/jcs/power-transfer")
+@RequestMapping(value = "/power-transfer")
 public class PowerTransferController extends BaseController {
 
     @Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/TemplateController.java

@@ -29,7 +29,7 @@ import java.util.Arrays;
 */
 @RestController
 @Api(tags = "模板表Api")
-@RequestMapping(value = "/jcs/template")
+@RequestMapping(value = "/template")
 public class TemplateController extends BaseController {
 
     @Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/UserController.java

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
-import com.yeejoin.amos.boot.biz.common.bo.DepartmentBo;
-import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.boot.biz.common.bo.RoleBo;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.biz.common.utils.CommonResponseUtil;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.RemoteSecurityService;
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import com.yeejoin.amos.feign.privilege.model.CompanyModel;
-import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
-import com.yeejoin.amos.feign.privilege.model.IdPasswordAuthModel;
-import com.yeejoin.amos.feign.privilege.model.RoleModel;
-import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -51,16 +37,27 @@ import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.stream.Collectors;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.google.common.collect.Maps;
+import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
+import com.yeejoin.amos.boot.biz.common.bo.DepartmentBo;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.bo.RoleBo;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.utils.CommonResponseUtil;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.RemoteSecurityService;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
+import com.yeejoin.amos.feign.privilege.model.RoleModel;
+import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 
 /**
  * 获取用户信息
@@ -68,7 +65,7 @@ import java.util.stream.Collectors;
  * @author gaodongdong
  */
 @RestController
-@RequestMapping(value = "/api/user")
+@RequestMapping(value = "/user")
 @Api(tags = "用户信息api")
 public class UserController extends BaseController {
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/DemoServiceImpl.java

-package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
-
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yeejoin.amos.boot.module.jcs.api.entity.CbDemo;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.DemoMapper;
-import com.yeejoin.amos.boot.module.jcs.api.service.IDemoService;
-
-import lombok.extern.slf4j.Slf4j;
-/**
- * <p>
- * 示例 服务实现类
- * </p>
- *
- * @Author: 李成龙
- * @Date: 2021-5-27
- */
-@Service
-@Slf4j
-public class DemoServiceImpl extends ServiceImpl<DemoMapper, CbDemo> implements IDemoService {
-
-    @Override
-    public CbDemo selectOneBySeqNbr(Long seqNbr) {
-        CbDemo demo = this.getBaseMapper().selectOneBySeqNbr(seqNbr);
-        return demo;
-    }
-}

amos-boot-module/amos-boot-module-biz/pom.xml

@@ -17,5 +17,6 @@
   	<module>amos-boot-module-tzs-biz</module>
   	<module>amos-boot-module-jcs-biz</module>
     <module>amos-boot-module-demo-biz</module>
+    <module>amos-boot-module-common-biz</module>
   </modules>
-</project>
+</project>
\ No newline at end of file