1.格式化

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/ShiftChangeDto.java

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 /**
-* 警情表单
-*
-* @author system_generator
-* @date 2021-07-13
-*/
+ * 警情表单
+ *
+ * @author system_generator
+ * @date 2021-07-13
+ */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="ShiftChangeDto", description="警情表单")
-public class ShiftChangeDto  extends BaseDto {
-
-   private static final long serialVersionUID = 1L;
+@ApiModel(value = "ShiftChangeDto", description = "警情表单")
+public class ShiftChangeDto extends BaseDto {
 
+    private static final long serialVersionUID = 1L;
 
 
     @ApiModelProperty(value = "基本信息id（来源动态表单）")
     private Long instanceId;
 
     @ApiModelProperty(value = "值班情况")
-    private String dutyJson;
+    private JSONObject dutyJson;
 
     @ApiModelProperty(value = "力量出动情况")
-    private String powerJson;
+    private JSONObject powerJson;
 
     @ApiModelProperty(value = "交接事宜描述")
     private String remark;

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

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
 /**
-* 警情表单
-*
-* @author system_generator
-* @date 2021-07-13
-*/
+ * 警情表单
+ *
+ * @author system_generator
+ * @date 2021-07-13
+ */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
@@ -22,28 +25,28 @@ public class ShiftChange extends BaseEntity {
 
 
     /**
-	  * 基本信息id（来源动态表单）
+     * 基本信息id（来源动态表单）
      */
-	@TableField("instance_id")
+    @TableField("instance_id")
     private Long instanceId;
     /**
-	  * 值班情况
+     * 值班情况
      */
-	@TableField("duty_json")
-    private String dutyJson;
+    @TableField(value = "duty_json", typeHandler = JacksonTypeHandler.class)
+    private JSONObject dutyJson;
     /**
-	  * 力量出动情况
+     * 力量出动情况
      */
-	@TableField("power_json")
+    @TableField(value = "power_json", typeHandler = JacksonTypeHandler.class)
     private String powerJson;
     /**
-	  * 交接事宜描述
+     * 交接事宜描述
      */
-	@TableField("remark")
+    @TableField("remark")
     private String remark;
     /**
-	  * 操作人名称
+     * 操作人名称
      */
-	@TableField("rec_user_name")
+    @TableField("rec_user_name")
     private String recUserName;
 }

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

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.ShiftChange;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.ShiftChange;
 
 /**
-* 警情表单 Mapper 接口
-*
-* @author system_generator
-* @date 2021-07-13
-*/
+ * 警情表单 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2021-07-13
+ */
 public interface ShiftChangeMapper extends BaseMapper<ShiftChange> {
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/ShiftChangeController.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.springframework.web.bind.annotation.RestController;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import java.util.List;
+import com.yeejoin.amos.boot.module.jcs.api.dto.ShiftChangeDto;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.ShiftChangeServiceImpl;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 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.jcs.api.dto.ShiftChangeDto;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 
 /**
-* 警情表单
-*
-* @author system_generator
-* @date 2021-07-13
-*/
+ * 警情表单
+ *
+ * @author system_generator
+ * @date 2021-07-13
+ */
 @RestController
 @Api(tags = "警情表单Api")
 @RequestMapping(value = "/jcs/shift-change")
@@ -32,77 +32,84 @@ public class ShiftChangeController extends BaseController {
     ShiftChangeServiceImpl shiftChangeServiceImpl;
 
     /**
-             * 新增警情表单
-    * @return
-    */
+     * 新增警情表单
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增警情表单", notes = "新增警情表单")
+    public ResponseModel<ShiftChangeDto> save(@RequestBody ShiftChangeDto model) {
+        model = shiftChangeServiceImpl.createWithModel(model);
+        return ResponseHelper.buildResponse(model);
+    }
+
+    /**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/save")
-	@ApiOperation(httpMethod = "POST", value = "新增警情表单", notes = "新增警情表单")
-	public ResponseModel<ShiftChangeDto> save(@RequestBody ShiftChangeDto model)
-	{
-	    model=shiftChangeServiceImpl.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<ShiftChangeDto> updateBySequenceNbrShiftChange(@RequestBody ShiftChangeDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(shiftChangeServiceImpl.updateWithModel(model));
-	}
-	/**
-             * 根据sequenceNbr删除
-    * @param sequenceNbr 主键
-    * @return
-    */
+    @PutMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新警情表单", notes = "根据sequenceNbr更新警情表单")
+    public ResponseModel<ShiftChangeDto> updateBySequenceNbrShiftChange(@RequestBody ShiftChangeDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        model.setSequenceNbr(sequenceNbr);
+        return ResponseHelper.buildResponse(shiftChangeServiceImpl.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){
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
         return ResponseHelper.buildResponse(shiftChangeServiceImpl.removeById(sequenceNbr));
     }
+
     /**
-             * 根据sequenceNbr查询
-    * @param sequenceNbr  主键
-    * @return
-    */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个警情表单",  notes = "根据sequenceNbr查询单个警情表单")
-	public ResponseModel<ShiftChangeDto> seleteOne(@PathVariable Long sequenceNbr)
-	{
-	    return ResponseHelper.buildResponse(shiftChangeServiceImpl.queryBySeq(sequenceNbr));
-	}
-	/**
-             * 列表分页查询
-    *@param current 当前页
-    *@param current 每页大小
-    * @return
-    */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "警情表单分页查询",  notes = "警情表单分页查询")
-	public ResponseModel<Page<ShiftChangeDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
-	{
-	    Page<ShiftChangeDto> page=new Page<ShiftChangeDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(shiftChangeServiceImpl.queryForShiftChangePage(page));
-	}
-	/**
-	*列表全部数据查询
-	*@return
-	*/
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "警情表单列表全部数据查询",   notes = "警情表单列表全部数据查询")
-	@GetMapping(value = "/list")
-	public ResponseModel<List<ShiftChangeDto>>  selectForList()
-	{
-	    return ResponseHelper.buildResponse(shiftChangeServiceImpl.queryForShiftChangeList());
-	}
+     * 根据sequenceNbr查询
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个警情表单", notes = "根据sequenceNbr查询单个警情表单")
+    public ResponseModel<ShiftChangeDto> seleteOne(@PathVariable Long sequenceNbr) {
+        return ResponseHelper.buildResponse(shiftChangeServiceImpl.queryBySeq(sequenceNbr));
+    }
+
+    /**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/page")
+    @ApiOperation(httpMethod = "GET", value = "警情表单分页查询", notes = "警情表单分页查询")
+    public ResponseModel<Page<ShiftChangeDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam(value = "size") int size) {
+        Page<ShiftChangeDto> page = new Page<ShiftChangeDto>();
+        page.setCurrent(current);
+        page.setSize(size);
+        return ResponseHelper.buildResponse(shiftChangeServiceImpl.queryForShiftChangePage(page));
+    }
+
+    /**
+     * 列表全部数据查询
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "警情表单列表全部数据查询", notes = "警情表单列表全部数据查询")
+    @GetMapping(value = "/list")
+    public ResponseModel<List<ShiftChangeDto>> selectForList() {
+        return ResponseHelper.buildResponse(shiftChangeServiceImpl.queryForShiftChangeList());
+    }
 }

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

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jcs.api.dto.ShiftChangeDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.ShiftChange;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.ShiftChangeMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.IShiftChangeService;
-import com.yeejoin.amos.boot.module.jcs.api.dto.ShiftChangeDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
 import java.util.List;
+
 /**
-* 警情表单服务实现类
-*
-* @author system_generator
-* @date 2021-07-13
-*/
+ * 警情表单服务实现类
+ *
+ * @author system_generator
+ * @date 2021-07-13
+ */
 @Service
-public class ShiftChangeServiceImpl extends BaseService<ShiftChangeDto,ShiftChange,ShiftChangeMapper> implements IShiftChangeService {
-        /**
-                            * 分页查询
-         */
-        public Page<ShiftChangeDto> queryForShiftChangePage(Page<ShiftChangeDto> page)   {
-                return this.queryForPage(page, null, false);
-        }
+public class ShiftChangeServiceImpl extends BaseService<ShiftChangeDto, ShiftChange, ShiftChangeMapper> implements IShiftChangeService {
+    /**
+     * 分页查询
+     */
+    public Page<ShiftChangeDto> queryForShiftChangePage(Page<ShiftChangeDto> page) {
+        return this.queryForPage(page, null, false);
+    }
 
-        /**
-                            * 列表查询 示例
-         */
-        public List<ShiftChangeDto> queryForShiftChangeList()   {
-                return this.queryForList("" , false);
-        }
+    /**
+     * 列表查询 示例
+     */
+    public List<ShiftChangeDto> queryForShiftChangeList() {
+        return this.queryForList("", false);
+    }
 }