消防专家生成

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/FireExpertsDto.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FireExpertsDto.java

-package com.yeejoin.amos.boot.module.jcs.api.dto;
+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import java.util.Date;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
 /**
 * 
 *
-* @author tb
-* @date 2021-06-07
+* @author system_generator
+* @date 2021-06-25
 */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value="FireExpertsDto", description="")
 public class FireExpertsDto extends BaseDto {
-    private static final long serialVersionUID = 1L;
+
+   private static final long serialVersionUID = 1L;
+
 
 
     @ApiModelProperty(value = "姓名")
@@ -49,42 +51,24 @@ public class FireExpertsDto extends BaseDto {
     @ApiModelProperty(value = "政治面貌")
     private String politicalLandscape;
 
-    @ApiModelProperty(value = "学历")
-    private String educationBackground;
-
-    @ApiModelProperty(value = "岗位名称")
-    private String jobs;
-
-    @ApiModelProperty(value = "领域")
-    private String field;
-
-    @ApiModelProperty(value = "是否内部专家")
-    private Boolean isnoInternal;
-
-    @ApiModelProperty(value = "消防机构id")
-    private Long fireTeamId;
-
-    @ApiModelProperty(value = "公用 电话")
+    @ApiModelProperty(value = "办公用 电话")
     private String officePhone;
 
     @ApiModelProperty(value = "移动电话")
     private String mobilePhone;
 
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "操作人名称")
-    private String recUserName;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
+    @ApiModelProperty(value = "最高学历")
+    private String educationBackground;
 
-    @ApiModelProperty(value = "备注")
-    private String note;
+    @ApiModelProperty(value = "岗位名称")
+    private String jobs;
 
     @ApiModelProperty(value = "岗位名称code")
     private String jobsCode;
 
+    @ApiModelProperty(value = "消防专家领域")
+    private String field;
+
     @ApiModelProperty(value = "消防专家领域code")
     private String fieldCode;
 
@@ -94,12 +78,24 @@ public class FireExpertsDto extends BaseDto {
     @ApiModelProperty(value = "资质证书")
     private String qualificationCertificate;
 
-    @ApiModelProperty(value = "人员状态")
+    @ApiModelProperty(value = "人员状态，在职/离职")
     private String state;
 
-    @ApiModelProperty(value = "状态code")
+    @ApiModelProperty(value = "人员状态，在职/离职code")
     private String stateCode;
 
+    @ApiModelProperty(value = "消防机构id")
+    private Long fireTeamId;
+
+    @ApiModelProperty(value = "备注")
+    private String note;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "操作人名称")
+    private String recUserName;
+
     @ApiModelProperty(value = "出生日期")
     private Date birthdayTime;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/FireExperts.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FireExperts.java

-package com.yeejoin.amos.boot.module.jcs.api.entity;
+package com.yeejoin.amos.boot.module.common.api.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-
-import java.util.Date;
-
 /**
- * @author tb
- * @date 2021-06-07
- */
+* 
+*
+* @author system_generator
+* @date 2021-06-25
+*/
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("cb_fire_experts")
-@ApiModel(value = "FireExperts对象", description = "消防专家")
+@ApiModel(value="FireExperts对象", description="")
 public class FireExperts extends BaseEntity {
-    /**
-     *
-     */
+
     private static final long serialVersionUID = 1L;
 
+
     @ApiModelProperty(value = "姓名")
     private String name;
 
@@ -54,44 +51,24 @@ public class FireExperts extends BaseEntity {
     @ApiModelProperty(value = "政治面貌")
     private String politicalLandscape;
 
-    @ApiModelProperty(value = "学历")
-    private String educationBackground;
-
-    @ApiModelProperty(value = "岗位名称")
-    private String jobs;
-
-    @ApiModelProperty(value = "领域")
-    private String field;
-
-    @ApiModelProperty(value = "是否内部专家")
-    private Boolean isnoInternal;
-
-    @ApiModelProperty(value = "消防机构id")
-    private Long fireTeamId;
-
-    @ApiModelProperty(value = "公用 电话")
+    @ApiModelProperty(value = "办公用 电话")
     private String officePhone;
 
     @ApiModelProperty(value = "移动电话")
     private String mobilePhone;
 
-    @ApiModelProperty(value = "更新时间")
-    @TableField(fill = FieldFill.UPDATE)
-    private Date updateTime;
-
-    @ApiModelProperty(value = "操作人名称")
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private String recUserName;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
+    @ApiModelProperty(value = "最高学历")
+    private String educationBackground;
 
-    @ApiModelProperty(value = "备注")
-    private String note;
+    @ApiModelProperty(value = "岗位名称")
+    private String jobs;
 
     @ApiModelProperty(value = "岗位名称code")
     private String jobsCode;
 
+    @ApiModelProperty(value = "消防专家领域")
+    private String field;
+
     @ApiModelProperty(value = "消防专家领域code")
     private String fieldCode;
 
@@ -101,11 +78,24 @@ public class FireExperts extends BaseEntity {
     @ApiModelProperty(value = "资质证书")
     private String qualificationCertificate;
 
-    @ApiModelProperty(value = "人员状态")
+    @ApiModelProperty(value = "人员状态，在职/离职")
     private String state;
 
-    @ApiModelProperty(value = "状态code")
+    @ApiModelProperty(value = "人员状态，在职/离职code")
     private String stateCode;
+
+    @ApiModelProperty(value = "消防机构id")
+    private Long fireTeamId;
+
+    @ApiModelProperty(value = "备注")
+    private String note;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "操作人名称")
+    private String recUserName;
+
     @ApiModelProperty(value = "出生日期")
     private Date birthdayTime;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FireExpertsMapper.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FireExpertsMapper.java

-package com.yeejoin.amos.boot.module.jcs.api.mapper;
+package com.yeejoin.amos.boot.module.common.api.mapper;
 
+import com.yeejoin.amos.boot.module.common.api.entity.FireExperts;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FireExperts;
 
 /**
 *  Mapper 接口
-*
-* @author tb
-* @date 2021-06-07
+*消防专家
+* @author system_generator
+* @date 2021-06-25
 */
 public interface FireExpertsMapper extends BaseMapper<FireExperts> {
 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IFireExpertsService.java

+package com.yeejoin.amos.boot.module.common.api.service;
+
+
+/**
+* 接口类
+*消防专家
+* @author system_generator
+* @date 2021-06-25
+*/
+public interface IFireExpertsService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/FireExpertsMapper.xml → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FireExpertsMapper.xml

 <?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.yeejoin.amos.boot.module.jcs.api.mapper.FireExpertsMapper">
+<mapper namespace="com.yeejoin.amos.boot.module.common.api.mapper.FireExpertsMapper">
 
 </mapper>

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

-package com.yeejoin.amos.boot.module.jcs.api.service;
-
-/**
-*  服务类
-*
-* @author tb
-* @date 2021-06-07
-*/
-public interface IFireExpertsService {
-
-}

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

+package com.yeejoin.amos.boot.module.common.biz.controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FireExpertsServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.FireExpertsDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+
+/**
+* 
+*消防专家
+* @author system_generator
+* @date 2021-06-25
+*/
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/common/fire-experts")
+public class FireExpertsController extends BaseController {
+
+    @Autowired
+    FireExpertsServiceImpl fireExpertsServiceImpl;
+
+    /**
+             * 新增
+    * @return
+    */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<FireExpertsDto> save(@RequestBody FireExpertsDto model)
+	{
+	    model=fireExpertsServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+	/**
+             * 根据sequenceNbr更新
+    * @param sequenceNbr 主键
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<FireExpertsDto> updateBySequenceNbrFireExperts(@RequestBody FireExpertsDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(fireExpertsServiceImpl.updateWithModel(model));
+	}
+	/**
+             * 根据sequenceNbr删除
+    * @param sequenceNbr 主键
+    * @return
+    */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(fireExpertsServiceImpl.removeById(sequenceNbr));
+    }
+    /**
+             * 根据sequenceNbr查询
+    * @param sequenceNbr  主键
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<FireExpertsDto> seleteOne(@PathVariable Long sequenceNbr)
+	{
+	    return ResponseHelper.buildResponse(fireExpertsServiceImpl.queryBySeq(sequenceNbr));
+	}
+	/**
+             * 列表分页查询
+    *@param current 当前页
+    *@param current 每页大小
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<FireExpertsDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
+	{
+	    Page<FireExpertsDto> page=new Page<FireExpertsDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(fireExpertsServiceImpl.queryForFireExpertsPage(page));
+	}
+	/**
+	*列表全部数据查询
+	*@return
+	*/
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<FireExpertsDto>>  selectForList()
+	{
+	    return ResponseHelper.buildResponse(fireExpertsServiceImpl.queryForFireExpertsList());
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FireExpertsServiceImpl.java

+package com.yeejoin.amos.boot.module.common.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.common.api.entity.FireExperts;
+import com.yeejoin.amos.boot.module.common.api.mapper.FireExpertsMapper;
+import com.yeejoin.amos.boot.module.common.api.service.IFireExpertsService;
+import com.yeejoin.amos.boot.module.common.api.dto.FireExpertsDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+/**
+* 服务实现类
+*消防专家
+* @author system_generator
+* @date 2021-06-25
+*/
+@Service
+public class FireExpertsServiceImpl extends BaseService<FireExpertsDto,FireExperts,FireExpertsMapper> implements IFireExpertsService {
+        /**
+        * 分页查询
+         */
+        public Page<FireExpertsDto> queryForFireExpertsPage(Page<FireExpertsDto> page)   {
+                return this.queryForPage(page, null, false);
+        }
+
+        /**
+        * 列表查询 示例
+         */
+        public List<FireExpertsDto> queryForFireExpertsList()   {
+                return this.queryForList("" , false);
+        }
+}

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

-package com.yeejoin.amos.boot.module.jcs.biz.controller;
-
-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.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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-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.NameUtils;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FireExperts;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FireExpertsServiceImpl;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-
-/**
-* 
-*
-* @author tb
-* @date 2021-06-07
-*/
-@RestController
-@Api(tags = "Api")
-@RequestMapping(value = "/fire-experts")
-public class FireExpertsController extends BaseController {
-
-    @Autowired
-    FireExpertsServiceImpl iFireExpertsService;
-
-    /**
-    * 新增
-    * @return
-    */
-    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
-    @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-    public boolean saveFireExperts(HttpServletRequest request, @RequestBody FireExperts fireExperts){
-        return iFireExpertsService.save(fireExperts);
-    }
-
-    /**
-    * 根据id删除
-    * @param id
-    * @return
-    */
-    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
-    @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
-    public boolean deleteById(HttpServletRequest request, @PathVariable Long id){
-        return iFireExpertsService.removeById(id);
-    }
-
-
-
-
-    /**
-    * 修改
-    * @return
-    */
-    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
-    @ApiOperation(httpMethod = "PUT", value = "修改", notes = "修改")
-    public boolean updateByIdFireExperts(HttpServletRequest request, @RequestBody FireExperts fireExperts){
-        return iFireExpertsService.updateById(fireExperts);
-    }
-
-
-
-    /**
-    * 根据id查询
-    * @param id
-    * @return
-    */
-    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
-    @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
-    public FireExperts selectById(HttpServletRequest request, @PathVariable Long id){
-        return iFireExpertsService.getById(id);
-    }
-
-
-
-    /**
-    * 列表分页查询
-    * @return
-    */
-    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
-    public IPage<FireExperts> listPage(String pageNum,String pageSize, FireExperts fireExperts){
-
-        Page<FireExperts> pageBean;
-        QueryWrapper<FireExperts> fireExpertsQueryWrapper = new QueryWrapper<>();
-        Class<? extends FireExperts> aClass = fireExperts.getClass();
-        Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
-            try {
-                field.setAccessible(true);
-                Object o = field.get(fireExperts);
-                if (o != null) {
-                    Class<?> type = field.getType();
-                    String name = NameUtils.camel2Underline(field.getName());
-                    if (type.equals(Integer.class)) {
-                        Integer fileValue = (Integer) field.get(fireExperts);
-                        fireExpertsQueryWrapper.eq(name, fileValue);
-                    } else if (type.equals(Long.class)) {
-                        Long fileValue = (Long) field.get(fireExperts);
-                        fireExpertsQueryWrapper.eq(name, fileValue);
-                    } else if (type.equals(String.class)) {
-                        String fileValue = (String) field.get(fireExperts);
-                        fireExpertsQueryWrapper.eq(name, fileValue);
-                    } else {
-                        String fileValue = (String) field.get(fireExperts);
-                        fireExpertsQueryWrapper.eq(name, fileValue);
-                    }
-                }
-            } catch (Exception e) {
-                throw  new RuntimeException("系统异常");
-            }
-        });
-        IPage<FireExperts> 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 = iFireExpertsService.page(pageBean, fireExpertsQueryWrapper);
-            return page;
-        }
-    }
-

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

-package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
-
-import com.yeejoin.amos.boot.module.jcs.api.dto.FireExpertsDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FireExperts;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.FireExpertsMapper;
-import com.yeejoin.amos.boot.module.jcs.api.service.IFireExpertsService;
-import org.springframework.stereotype.Service;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-
-/**
-*  服务实现类
-*
-* @author tb
-* @date 2021-06-07
-*/
-@Service
-public class FireExpertsServiceImpl extends BaseService<FireExpertsDto,FireExperts,FireExpertsMapper> implements IFireExpertsService {
-
-}