更新接口

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/HouseholdPvDto.java

@@ -28,7 +28,7 @@ public class HouseholdPvDto  extends BaseDto {
     private String number;
 
     @ApiModelProperty(value = "厂商")
-    private String platformCompanyId;
+    private Long platformCompanyId;
 
     @ApiModelProperty(value = "性别")
     private String sex;

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/HouseholdPvImport.java

+package com.yeejoin.amos.boot.module.jxiop.api.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class HouseholdPvImport {
+    @ColumnWidth(15)
+    @ExcelProperty(value = "所属场站", index = 0)
+    private String platformCompanyId;
+    @ColumnWidth(15)
+    @ExcelProperty(value = "户号", index = 1)
+    private String number;
+    @ColumnWidth(15)
+    @ExcelProperty(value = "户主姓名", index = 2)
+    private String name;
+    @ColumnWidth(15)
+    @ExcelProperty(value = "性别", index = 3)
+    private String sex;
+    @ColumnWidth(15)
+    @ExcelProperty(value = "身份证号", index = 4)
+    private String idNumber;
+    @ColumnWidth(20)
+    @ExcelProperty(value = "证件过期时间", index = 5)
+    private String expiryTime;
+    @ColumnWidth(15)
+    @ExcelProperty(value = "签发机关", index = 6)
+    private String issuingAuthority;
+    @ColumnWidth(15)
+    @ExcelProperty(value = "户籍地址", index = 7)
+    private String residenceAddress;
+    @ColumnWidth(15)
+    @ExcelProperty(value = "手机号码", index = 8)
+    private String phone;
+    @ColumnWidth(15)
+    @ExcelProperty(value = "居住地", index = 9)
+    private String address;
+    @ColumnWidth(15)
+    @ExcelProperty(value = "居住地邮编", index = 10)
+    private String postcode;
+    @ColumnWidth(15)
+    @ExcelProperty(value = "送达地址", index = 11)
+    private String serviceAddress;
+
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/entity/HouseholdPv.java

@@ -38,7 +38,7 @@ public class HouseholdPv extends BaseEntity {
      * 厂商
      */
 	@TableField("platform_company_id")
-    private String platformCompanyId;
+    private Long platformCompanyId;
 
     /**
      * 性别

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/mapper/HouseholdPvMapper.java

 package com.yeejoin.amos.boot.module.jxiop.api.mapper;
 
+import com.yeejoin.amos.boot.module.jxiop.api.dto.HouseholdPvDto;
+import com.yeejoin.amos.boot.module.jxiop.api.dto.HouseholdPvImport;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.HouseholdPv;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 户用光伏表 Mapper 接口
@@ -11,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface HouseholdPvMapper extends BaseMapper<HouseholdPv> {
 
+    List<HouseholdPvImport> selectExportList(@Param("dto")HouseholdPvDto dto );
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/service/IHouseholdPvService.java

 package com.yeejoin.amos.boot.module.jxiop.api.service;
 
 
+import com.yeejoin.amos.boot.module.jxiop.api.dto.HouseholdPvDto;
+import com.yeejoin.amos.boot.module.jxiop.api.dto.HouseholdPvImport;
+
+import java.util.List;
+
 /**
  * 户用光伏表接口类
  *
@@ -9,4 +14,9 @@ package com.yeejoin.amos.boot.module.jxiop.api.service;
  */
 public interface IHouseholdPvService {
 
+    void importData(List<HouseholdPvImport> list);
+
+    List<HouseholdPvImport> selectExportList(HouseholdPvDto dto);
+
+    void deleteBatch(List<Long> ids);
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/HouseholdPvMapper.xml

@@ -2,4 +2,21 @@
 <!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.jxiop.api.mapper.HouseholdPvMapper">
 
+    <select id="selectExportList" resultType="com.yeejoin.amos.boot.module.jxiop.api.dto.HouseholdPvImport">
+        SELECT * FROM `household_pv` hp
+        <where>
+            <if test="dto.name != null and dto.name != ''">
+                and hp.name like concat('%',#{dto.name},'%')
+            </if>
+            <if test="dto.platformCompanyId != null and dto.platformCompanyId != ''">
+                and hp.platform_company_id = #{dto.platformCompanyId}
+            </if>
+            <if test="dto.residenceAddress != null and dto.residenceAddress != ''">
+                and hp.residence_address like concat('%',#{residenceAddress},'%')
+            </if>
+            <if test="dto.number != null and dto.number != ''">
+                and hp.number like concat('%',#{dto.number},'%')
+            </if>
+        </where>
+    </select>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/HouseholdPvServiceImpl.java

 package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.yeejoin.amos.boot.module.common.api.enums.ExcelSelectData;
+import com.yeejoin.amos.boot.module.jxiop.api.dto.HouseholdPvImport;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.HouseholdPv;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.HouseholdPvMapper;
 import com.yeejoin.amos.boot.module.jxiop.api.service.IHouseholdPvService;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.HouseholdPvDto;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTimeUtils;
+import org.joda.time.LocalDateTime;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.*;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -17,11 +35,29 @@ import java.util.List;
  */
 @Service
 public class HouseholdPvServiceImpl extends BaseService<HouseholdPvDto,HouseholdPv,HouseholdPvMapper> implements IHouseholdPvService {
+
+    @Autowired
+    HouseholdPvMapper householdPvMapper;
+
+
     /**
      * 分页查询
      */
-    public Page<HouseholdPvDto> queryForHouseholdPvPage(Page<HouseholdPvDto> page)   {
-        return this.queryForPage(page, null, false);
+    public IPage<HouseholdPv> queryForHouseholdPvPage(Page<HouseholdPv> page, HouseholdPvDto dto)   {
+        LambdaQueryWrapper<HouseholdPv> lambda = new QueryWrapper<HouseholdPv>().lambda();
+        if (!ObjectUtils.isEmpty(dto.getName())){
+            lambda.like(HouseholdPv::getName, dto.getName());
+        }
+        if (!ObjectUtils.isEmpty(dto.getPlatformCompanyId())){
+            lambda.eq(HouseholdPv::getPlatformCompanyId, dto.getPlatformCompanyId());
+        }
+        if (!ObjectUtils.isEmpty(dto.getAddress())){
+            lambda.like(HouseholdPv::getAddress, dto.getAddress());
+        }
+        if (!ObjectUtils.isEmpty(dto.getNumber())){
+            lambda.like(HouseholdPv::getNumber, dto.getNumber());
+        }
+        return householdPvMapper.selectPage(page, lambda);
     }
 
     /**
@@ -30,4 +66,34 @@ public class HouseholdPvServiceImpl extends BaseService<HouseholdPvDto,Household
     public List<HouseholdPvDto> queryForHouseholdPvList()   {
         return this.queryForList("" , false);
     }
+
+    @Override
+    public void importData(List<HouseholdPvImport> list) {
+        ArrayList<HouseholdPv> householdPvs = new ArrayList<>();
+        list.forEach(item ->{
+            HouseholdPv householdPv = new HouseholdPv();
+            householdPv.setCreateTime(LocalDateTime.now().toDate());
+            if (!ObjectUtils.isEmpty(item.getExpiryTime())){
+                try {
+                    Date date = DateUtils.dateParse(item.getExpiryTime(), DateUtils.DATE_PATTERN);
+                    householdPv.setExpiryTime(date);
+                } catch (ParseException e) {
+                    e.printStackTrace();
+                }
+            }
+            BeanUtils.copyProperties(item,householdPv);
+            householdPvs.add(householdPv);
+        });
+        this.saveBatch(householdPvs);
+    }
+
+    @Override
+    public List<HouseholdPvImport> selectExportList(HouseholdPvDto dto) {
+        return householdPvMapper.selectExportList(dto);
+    }
+
+    @Override
+    public void deleteBatch(List<Long> ids) {
+        householdPvMapper.deleteBatchIds(ids);
+    }
 }
\ No newline at end of file