修改文件格式

boman-web-core/src/main/java/com/boman/web/core/controller/VaccineInfoController.java

@@ -20,13 +20,12 @@ 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.RestController;
-import com.boman.web.core.domain.VaccineInfo;
 
 import javax.servlet.http.HttpServletResponse;
 
 /**
  * 疫苗信息Controller
- * 
+ *
  * @author ruoyi
  * @date 2021-09-05
  */
@@ -39,10 +38,9 @@ public class VaccineInfoController extends BaseController {
     /**
      * 查询疫苗信息列表
      */
-    @PreAuthorize(hasPermi ="@ss.hasPermi('core:info:list')")
+    @PreAuthorize(hasPermi = "@ss.hasPermi('core:info:list')")
     @GetMapping("/list")
-    public TableDataInfo list(VaccineInfo vaccineInfo)
-    {
+    public TableDataInfo list(VaccineInfo vaccineInfo) {
         startPage();
         List<VaccineInfo> list = vaccineInfoService.selectVaccineInfoList(vaccineInfo);
         return getDataTable(list);
@@ -51,10 +49,10 @@ public class VaccineInfoController extends BaseController {
     /**
      * 导出疫苗信息列表
      */
-    @PreAuthorize(hasPermi ="@ss.hasPermi('core:info:export')")
+    @PreAuthorize(hasPermi = "@ss.hasPermi('core:info:export')")
     @Log(title = "疫苗信息", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public void export(HttpServletResponse response, VaccineInfo vaccineInfo)  throws IOException {
+    public void export(HttpServletResponse response, VaccineInfo vaccineInfo) throws IOException {
         List<VaccineInfo> list = vaccineInfoService.selectVaccineInfoList(vaccineInfo);
         ExcelUtil<VaccineInfo> util = new ExcelUtil<VaccineInfo>(VaccineInfo.class);
         util.exportExcel(response, list, "info");
@@ -63,42 +61,39 @@ public class VaccineInfoController extends BaseController {
     /**
      * 获取疫苗信息详细信息
      */
-    @PreAuthorize(hasPermi ="@ss.hasPermi('core:info:query')")
+    @PreAuthorize(hasPermi = "@ss.hasPermi('core:info:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(vaccineInfoService.selectVaccineInfoById(id));
     }
 
     /**
      * 新增疫苗信息
      */
-    @PreAuthorize(hasPermi ="@ss.hasPermi('core:info:add')")
+    @PreAuthorize(hasPermi = "@ss.hasPermi('core:info:add')")
     @Log(title = "疫苗信息", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody VaccineInfo vaccineInfo)  {
+    public AjaxResult add(@RequestBody VaccineInfo vaccineInfo) {
         return toAjax(vaccineInfoService.insertVaccineInfo(vaccineInfo));
     }
 
     /**
      * 修改疫苗信息
      */
-    @PreAuthorize(hasPermi ="@ss.hasPermi('core:info:edit')")
+    @PreAuthorize(hasPermi = "@ss.hasPermi('core:info:edit')")
     @Log(title = "疫苗信息", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody VaccineInfo vaccineInfo)
-    {
+    public AjaxResult edit(@RequestBody VaccineInfo vaccineInfo) {
         return toAjax(vaccineInfoService.updateVaccineInfo(vaccineInfo));
     }
 
     /**
      * 删除疫苗信息
      */
-    @PreAuthorize(hasPermi ="@ss.hasPermi('core:info:remove')")
+    @PreAuthorize(hasPermi = "@ss.hasPermi('core:info:remove')")
     @Log(title = "疫苗信息", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(vaccineInfoService.deleteVaccineInfoByIds(ids));
     }
 }

boman-web-core/src/main/java/com/boman/web/core/controller/VaccineInfoOperationController.java

@@ -24,14 +24,13 @@ import com.boman.web.core.domain.VaccineInfoOperation;
 
 /**
  * 疫苗信息操作Controller
- * 
+ *
  * @author ruoyi
  * @date 2021-09-05
  */
 @RestController
 @RequestMapping("/core/operation")
-public class VaccineInfoOperationController extends BaseController
-{
+public class VaccineInfoOperationController extends BaseController {
     @Autowired
     private IVaccineInfoOperationService vaccineInfoOperationService;
 
@@ -40,8 +39,7 @@ public class VaccineInfoOperationController extends BaseController
      */
     @PreAuthorize(hasPermi = "@ss.hasPermi('core:operation:list')")
     @GetMapping("/list")
-    public TableDataInfo list(VaccineInfoOperation vaccineInfoOperation)
-    {
+    public TableDataInfo list(VaccineInfoOperation vaccineInfoOperation) {
         startPage();
         List<VaccineInfoOperation> list = vaccineInfoOperationService.selectVaccineInfoOperationList(vaccineInfoOperation);
         return getDataTable(list);
@@ -53,11 +51,10 @@ public class VaccineInfoOperationController extends BaseController
     @PreAuthorize(hasPermi = "@ss.hasPermi('core:operation:export')")
     @Log(title = "疫苗信息操作", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(VaccineInfoOperation vaccineInfoOperation)
-    {
+    public AjaxResult export(VaccineInfoOperation vaccineInfoOperation) {
         List<VaccineInfoOperation> list = vaccineInfoOperationService.selectVaccineInfoOperationList(vaccineInfoOperation);
         ExcelUtil<VaccineInfoOperation> util = new ExcelUtil<VaccineInfoOperation>(VaccineInfoOperation.class);
-       // return util.exportExcel(list, "operation");
+        // return util.exportExcel(list, "operation");
         return null;
     }
 
@@ -66,8 +63,7 @@ public class VaccineInfoOperationController extends BaseController
      */
     @PreAuthorize(hasPermi = "@ss.hasPermi('core:operation:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(vaccineInfoOperationService.selectVaccineInfoOperationById(id));
     }
 
@@ -77,8 +73,7 @@ public class VaccineInfoOperationController extends BaseController
     @PreAuthorize(hasPermi = "@ss.hasPermi('core:operation:add')")
     @Log(title = "疫苗信息操作", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody VaccineInfoOperation vaccineInfoOperation)
-    {
+    public AjaxResult add(@RequestBody VaccineInfoOperation vaccineInfoOperation) {
         return toAjax(vaccineInfoOperationService.insertVaccineInfoOperation(vaccineInfoOperation));
     }
 
@@ -88,8 +83,7 @@ public class VaccineInfoOperationController extends BaseController
     @PreAuthorize(hasPermi = "@ss.hasPermi('core:operation:edit')")
     @Log(title = "疫苗信息操作", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody VaccineInfoOperation vaccineInfoOperation)
-    {
+    public AjaxResult edit(@RequestBody VaccineInfoOperation vaccineInfoOperation) {
         return toAjax(vaccineInfoOperationService.updateVaccineInfoOperation(vaccineInfoOperation));
     }
 
@@ -98,9 +92,8 @@ public class VaccineInfoOperationController extends BaseController
      */
     @PreAuthorize(hasPermi = "@ss.hasPermi('core:operation:remove')")
     @Log(title = "疫苗信息操作", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(vaccineInfoOperationService.deleteVaccineInfoOperationByIds(ids));
     }
 }

boman-web-core/src/main/java/com/boman/web/core/domain/VaccineInfo.java

@@ -1,425 +0,0 @@
-package com.boman.web.core.domain;
-
-import java.util.Date;
-
-import com.boman.domain.BaseEntity;
-import com.boman.domain.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-
-/**
- * 疫苗信息对象 vaccine_info
- * 
- * @author ruoyi
- * @date 2021-09-05
- */
-public class VaccineInfo extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 编号 */
-    private Long id;
-
-    /** 乡镇 */
-    @Excel(name = "乡镇")
-    private String villageTowns;
-
-    /** 村居 */
-    @Excel(name = "村居")
-    private String village;
-
-    /** 村民组（社区） */
-    @Excel(name = "村民组", readConverterExp = "社=区")
-    private String villagerGroup;
-
-    /** 户别 */
-    @Excel(name = "户别")
-    private String houseType;
-
-    /** 户籍地 */
-    @Excel(name = "户籍地")
-    private String domicile;
-
-    /** 省 */
-    @Excel(name = "省")
-    private String province;
-
-    /** 市 */
-    @Excel(name = "市")
-    private String city;
-
-    /** 区 */
-    @Excel(name = "区")
-    private String 
-area;
-
-    /** 姓名 */
-    @Excel(name = "姓名")
-    private String userName;
-
-    /** 性别 */
-    @Excel(name = "性别")
-    private String gender;
-
-    /** 身份证号码 */
-    @Excel(name = "身份证号码")
-    private String idCard;
-
-    /** 联系号码 */
-    @Excel(name = "联系号码")
-    private String phoneNum;
-
-    /** 重点行业 */
-    @Excel(name = "重点行业")
-    private String keyIndustries;
-
-    /** 接种情况（是/否） */
-    @Excel(name = "接种情况", readConverterExp = "是=/否")
-    private String isVaccination;
-
-    /** 疫苗名称 */
-    @Excel(name = "疫苗名称")
-    private String vaccineName;
-
-    /** 剂次（1/2/3/加强针） */
-    @Excel(name = "剂次", readConverterExp = "1=/2/3/加强针")
-    private String jici;
-
-    /** 接种时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "接种时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date vaccinationTime;
-
-    /** 接种地点 */
-    @Excel(name = "接种地点")
-    private String vaccinationPlace;
-
-    /** 禁忌症 */
-    @Excel(name = "禁忌症")
-    private String contraindication;
-
-    /** 暂缓 */
-    @Excel(name = "暂缓")
-    private String suspend;
-
-    /** 死亡 */
-    @Excel(name = "死亡")
-    private String death;
-
-    /** 失联失踪 */
-    @Excel(name = "失联失踪")
-    private String lostInMissing;
-
-    /** 应种未种 */
-    @Excel(name = "应种未种")
-    private String shouldBe;
-
-    /** 其他 */
-    @Excel(name = "其他")
-    private String other;
-
-    /** 进度 */
-    @Excel(name = "进度")
-    private String progress;
-
-    /** 状态 */
-    @Excel(name = "状态")
-    private String status;
-
-    /** 是否删除 */
-    @Excel(name = "是否删除")
-    private String isDel;
-
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setVillageTowns(String villageTowns) 
-    {
-        this.villageTowns = villageTowns;
-    }
-
-    public String getVillageTowns() 
-    {
-        return villageTowns;
-    }
-    public void setVillage(String village) 
-    {
-        this.village = village;
-    }
-
-    public String getVillage() 
-    {
-        return village;
-    }
-    public void setVillagerGroup(String villagerGroup) 
-    {
-        this.villagerGroup = villagerGroup;
-    }
-
-    public String getVillagerGroup() 
-    {
-        return villagerGroup;
-    }
-    public void setHouseType(String houseType) 
-    {
-        this.houseType = houseType;
-    }
-
-    public String getHouseType() 
-    {
-        return houseType;
-    }
-    public void setDomicile(String domicile) 
-    {
-        this.domicile = domicile;
-    }
-
-    public String getDomicile() 
-    {
-        return domicile;
-    }
-    public void setProvince(String province) 
-    {
-        this.province = province;
-    }
-
-    public String getProvince() 
-    {
-        return province;
-    }
-    public void setCity(String city) 
-    {
-        this.city = city;
-    }
-
-    public String getCity() 
-    {
-        return city;
-    }
-    public void setarea(String area) {
-        this.area = area;
-    }
-
-    public String getarea()  {
-        return area;
-    }
-
-    public void setUserName(String userName) 
-    {
-        this.userName = userName;
-    }
-
-    public String getUserName() 
-    {
-        return userName;
-    }
-    public void setGender(String gender) 
-    {
-        this.gender = gender;
-    }
-
-    public String getGender() 
-    {
-        return gender;
-    }
-    public void setIdCard(String idCard) 
-    {
-        this.idCard = idCard;
-    }
-
-    public String getIdCard() 
-    {
-        return idCard;
-    }
-    public void setPhoneNum(String phoneNum) 
-    {
-        this.phoneNum = phoneNum;
-    }
-
-    public String getPhoneNum() 
-    {
-        return phoneNum;
-    }
-    public void setKeyIndustries(String keyIndustries) 
-    {
-        this.keyIndustries = keyIndustries;
-    }
-
-    public String getKeyIndustries() 
-    {
-        return keyIndustries;
-    }
-    public void setIsVaccination(String isVaccination) 
-    {
-        this.isVaccination = isVaccination;
-    }
-
-    public String getIsVaccination() 
-    {
-        return isVaccination;
-    }
-    public void setVaccineName(String vaccineName) 
-    {
-        this.vaccineName = vaccineName;
-    }
-
-    public String getVaccineName() 
-    {
-        return vaccineName;
-    }
-    public void setJici(String jici) 
-    {
-        this.jici = jici;
-    }
-
-    public String getJici() 
-    {
-        return jici;
-    }
-    public void setVaccinationTime(Date vaccinationTime) 
-    {
-        this.vaccinationTime = vaccinationTime;
-    }
-
-    public Date getVaccinationTime() 
-    {
-        return vaccinationTime;
-    }
-    public void setVaccinationPlace(String vaccinationPlace) 
-    {
-        this.vaccinationPlace = vaccinationPlace;
-    }
-
-    public String getVaccinationPlace() 
-    {
-        return vaccinationPlace;
-    }
-    public void setContraindication(String contraindication) 
-    {
-        this.contraindication = contraindication;
-    }
-
-    public String getContraindication() 
-    {
-        return contraindication;
-    }
-    public void setSuspend(String suspend) 
-    {
-        this.suspend = suspend;
-    }
-
-    public String getSuspend() 
-    {
-        return suspend;
-    }
-    public void setDeath(String death) 
-    {
-        this.death = death;
-    }
-
-    public String getDeath() 
-    {
-        return death;
-    }
-    public void setLostInMissing(String lostInMissing) 
-    {
-        this.lostInMissing = lostInMissing;
-    }
-
-    public String getLostInMissing() 
-    {
-        return lostInMissing;
-    }
-    public void setShouldBe(String shouldBe) 
-    {
-        this.shouldBe = shouldBe;
-    }
-
-    public String getShouldBe() 
-    {
-        return shouldBe;
-    }
-    public void setOther(String other) 
-    {
-        this.other = other;
-    }
-
-    public String getOther() 
-    {
-        return other;
-    }
-    public void setProgress(String progress) 
-    {
-        this.progress = progress;
-    }
-
-    public String getProgress() 
-    {
-        return progress;
-    }
-    public void setStatus(String status) 
-    {
-        this.status = status;
-    }
-
-    public String getStatus() 
-    {
-        return status;
-    }
-    public void setIsDel(String isDel) 
-    {
-        this.isDel = isDel;
-    }
-
-    public String getIsDel() 
-    {
-        return isDel;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("villageTowns", getVillageTowns())
-            .append("village", getVillage())
-            .append("villagerGroup", getVillagerGroup())
-            .append("houseType", getHouseType())
-            .append("domicile", getDomicile())
-            .append("province", getProvince())
-            .append("city", getCity())
-            .append("area", getarea())
-            .append("userName", getUserName())
-            .append("gender", getGender())
-            .append("idCard", getIdCard())
-            .append("phoneNum", getPhoneNum())
-            .append("keyIndustries", getKeyIndustries())
-            .append("isVaccination", getIsVaccination())
-            .append("vaccineName", getVaccineName())
-            .append("jici", getJici())
-            .append("vaccinationTime", getVaccinationTime())
-            .append("vaccinationPlace", getVaccinationPlace())
-            .append("contraindication", getContraindication())
-            .append("suspend", getSuspend())
-            .append("death", getDeath())
-            .append("lostInMissing", getLostInMissing())
-            .append("shouldBe", getShouldBe())
-            .append("other", getOther())
-            .append("progress", getProgress())
-            .append("remark", getRemark())
-            .append("status", getStatus())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("isDel", getIsDel())
-            .toString();
-    }
-}

boman-web-core/src/main/java/com/boman/web/core/mapper/VaccineInfoMapper.java

@@ -1,7 +1,6 @@
 package com.boman.web.core.mapper;
 
 import java.util.List;
-import com.boman.web.core.domain.VaccineInfo;
 
 /**
  * 疫苗信息Mapper接口

boman-web-core/src/main/java/com/boman/web/core/service/vaccineInfo/IVaccineInfoService.java

@@ -1,7 +1,6 @@
 package com.boman.web.core.service.vaccineInfo;
 
 import java.util.List;
-import com.boman.web.core.domain.VaccineInfo;
 
 /**
  * 疫苗信息Service接口

boman-web-core/src/main/java/com/boman/web/core/service/vaccineInfo/impl/VaccineInfoServiceImpl.java

@@ -7,7 +7,6 @@ import com.boman.web.core.service.vaccineInfo.IVaccineInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.boman.web.core.mapper.VaccineInfoMapper;
-import com.boman.web.core.domain.VaccineInfo;
 
 /**
  * 疫苗信息Service业务层处理

boman-web-core/src/main/resources/mapper/VaccineInfoMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.boman.web.core.mapper.VaccineInfoMapper">
     
-    <resultMap type="VaccineInfo" id="VaccineInfoResult">
+    <resultMap type="VaccineInfoOperation" id="VaccineInfoResult">
         <result property="id"    column="id"    />
         <result property="villageTowns"    column="village_towns" />
         <result property="village"    column="village"    />
@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 area, user_name, gender, id_card, phone_num, key_industries, is_vaccination, vaccine_name, jici, vaccination_time, vaccination_place, contraindication, suspend, death, lost_in_missing, should_be, other, progress, remark, status, create_by, create_time, update_by, update_time, is_del from vaccine_info
     </sql>
 
-    <select id="selectVaccineInfoList" parameterType="VaccineInfo" resultMap="VaccineInfoResult">
+    <select id="selectVaccineInfoList" parameterType="VaccineInfoOperation" resultMap="VaccineInfoResult">
         <include refid="selectVaccineInfoVo"/>
         <where>  
             <if test="villageTowns != null  and villageTowns != ''"> and village_towns = #{villageTowns}</if>
@@ -83,7 +83,7 @@ area, user_name, gender, id_card, phone_num, key_industries, is_vaccination, vac
         where id = #{id}
     </select>
         
-    <insert id="insertVaccineInfo" parameterType="VaccineInfo" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertVaccineInfo" parameterType="VaccineInfoOperation" useGeneratedKeys="true" keyProperty="id">
         insert into vaccine_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="villageTowns != null">village_towns,</if>
@@ -155,7 +155,7 @@ area, user_name, gender, id_card, phone_num, key_industries, is_vaccination, vac
          </trim>
     </insert>
 
-    <update id="updateVaccineInfo" parameterType="VaccineInfo">
+    <update id="updateVaccineInfo" parameterType="VaccineInfoOperation">
         update vaccine_info
         <trim prefix="SET" suffixOverrides=",">
             <if test="villageTowns != null">village_towns = #{villageTowns},</if>