diff --git a/config/application.properties b/config/application.properties index 479208f..9cd1765 100644 --- a/config/application.properties +++ b/config/application.properties @@ -6,3 +6,6 @@ oncesCounts=10000 syfwSwitch=false syrkSwitch=false jksbSwitch=true + + + diff --git a/src/main/java/com/ssf/mysqloracletest/domain/TJksbglMysql.java b/src/main/java/com/ssf/mysqloracletest/domain/TJksbglMysql.java index 98cac62..db7c15b 100644 --- a/src/main/java/com/ssf/mysqloracletest/domain/TJksbglMysql.java +++ b/src/main/java/com/ssf/mysqloracletest/domain/TJksbglMysql.java @@ -11,6 +11,7 @@ import lombok.Data; */ @Data + public class TJksbglMysql { /** * diff --git a/src/main/java/com/ssf/mysqloracletest/domain/VillageSendRecordStatic.java b/src/main/java/com/ssf/mysqloracletest/domain/VillageSendRecordStatic.java deleted file mode 100644 index efedc99..0000000 --- a/src/main/java/com/ssf/mysqloracletest/domain/VillageSendRecordStatic.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.ssf.mysqloracletest.domain; - -import lombok.Data; - -/** - * village_send_vehicle_record - * 形体抓拍转发记录表 - */ -@Data -public class VillageSendRecordStatic { - private String id; - private String villageCode; - private String villageName; - private String deviceCode; - private String tableName; - private String tableId; - private String sendTime; - private String receiveTime; - private String manufactorNo; - private String receiptId; - private String resultStatus; - private String resultRemark; - private String isactive; - private String c1; - private String c2; - private String c3; - private String c4; - private String c5; - -} diff --git a/src/main/java/com/ssf/mysqloracletest/domain/VillageUserInfo.java b/src/main/java/com/ssf/mysqloracletest/domain/VillageUserInfo.java deleted file mode 100644 index 14811af..0000000 --- a/src/main/java/com/ssf/mysqloracletest/domain/VillageUserInfo.java +++ /dev/null @@ -1,397 +0,0 @@ -package com.ssf.mysqloracletest.domain; - -import com.alibaba.fastjson.JSONObject; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import java.util.Date; - -/** - * 住户信息对象 village_user_info - * - * @author ruoyi - */ -@Data -public class VillageUserInfo { - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private Long id; - - /** - * 小区编码 - */ - private String villageCode; - - /** - * 小区名称 - */ - //@Excel(name = "小区名称*") - private String villageName; - /** - * 网格名称 - */ - //@Excel(name = "网格名称*") - private String gridName; - /** - * 楼栋名称 - */ - //@Excel(name = "楼栋名称*") - private String buildingName; - /** - * 单元名称 - */ - //@Excel(name = "单元名称*") - private String unitName; - /** - * 房屋名称 - */ - //@Excel(name = "房屋名称*") - private String homeName; - - /** - * 人员姓名 - */ - //@Excel(name = "住户姓名*") - private String userName; - /** - * 人员类型 - */ - //@Excel(name = "人员类型*", comboWt = "person_type") - private String personTypeCn; - /** - * 证件类型 - */ - //@Excel(name = "证件类型", comboWt = "identity_type") - private String identityTypeCn; - /** - * 证件号码 - */ - //@Excel(name = "证件号码*") - private String idcard; - /** - * 人员类别 - */ - //@Excel(name = "人员类别*", comboWt = "person_category") - private String personCategoryCn; - - /** - * 联系电话 - */ - //@Excel(name = "联系电话") - private String phone; - /** - * 出生日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - //@Excel(name = "出生日期", width = 30, dateFormat = "yyyy-MM-dd") - private Date birthday; - /** - * 关爱人员标签 - */ - //@Excel(name = "关爱人员标签", comboWt = "caring_label") - private String caringLabelCn; - /** - * 是否户主 - */ - //@Excel(name = "是否户主*", comboWt = "is_householder") - private String isHouseholderCn; - /** - * 与户主关系 - */ - //@Excel(name = "与户主关系*", comboWt = "householder_relation") - private String householderRelationCn; - /** - * 性别 - */ - //@Excel(name = "性别", comboWt = "sex") - private String sexCn; - //@Excel(name = "民族", comboWt = "nation") - private String nationCn; - /** - * 国籍 - */ - //@Excel(name = "国籍", comboWt = "nationality") - private String nationalityCn; - - /** - * 籍贯 - */ - //@Excel(name = "籍贯" ) - private String nativeplace; - /** - * 学历 - */ - //@Excel(name = "学历", comboWt = "education") - private String educationCn; - /** - * 政治面貌 - */ - //@Excel(name = "政治面貌", comboWt = "political_outlook") - private String politicalOutlookCn; - - /** - * 户籍 - */ - //@Excel(name = "户籍") - private String houseHoldRegister; - - /** - * 户籍地址 - */ - //@Excel(name = "户籍地址") - private String houseHoldAddress; - - /** - * 宗教信仰 - */ - //@Excel(name = "宗教信仰") - private String religious; - - - /** - * 网格编码 - */ - private String gridCode; - - /** - * 楼栋编号 - */ - private String buildingCode; - - - /** - * 单元编码 - */ - private String unitCode; - - - /** - * 房屋编码 - */ - private String homeCode; - - /** - * 人员照片 - */ - private String userPic; - - /** - * 常口库标准照片 - */ - private String userStandardPic; - //标准图片是空参数 - private String userStandardPicIsNull; - - /** - * 证件类型 - */ - private Integer identityType; - - - private String idcardCn; - - /** - * 性别 - */ - private Integer sex; - - - /** - * 民族 - */ - private Integer nation; - - /** - * 公司名称 - */ -// //@Excel(name = "公司名称") - private String company; - - private String phoneCn; - - /** - * 国籍 - */ - private Integer nationality; - - - /** - * 学历 - */ - private Integer education; - - - /** - * 现居行政区编码 - */ -// //@Excel(name = "现居行政区编码") - private String areaCode; - - /** - * 现居行政区名称 - */ -// //@Excel(name = "现居行政区名称") - private String areaName; - - /** - * 实际居住地 - */ -// //@Excel(name = "实际居住地") - private String habitation; - - - /** - * 政治面貌 - */ - private Integer politicalOutlook; - - - /** - * 入境时间 - */ -// //@Excel(name = "入境时间") - private Long entryTime; - - /** - * 婚姻状况 - */ - private Integer marriage; - /** - * 婚姻状况 - */ -// //@Excel(name = "婚姻状况", comboWt = "marriage") - private String marriageCn; - - /** - * 人员类型 - */ - private Integer personType; - - - /** - * 人员类别 - */ - private Integer personCategory; - - - /** - * 关爱人员标签 - */ - private Integer caringLabel; - - - /** - * 是否户主 - */ - private Integer isHouseholder; - - - /** - * 与户主关系 - */ - private Integer householderRelation; - - /** - * 是否接种疫苗 - */ - private Integer isVaccinate; - /** - * 是否接种疫苗 - */ - private String isVaccinateCn; - - /** - * 是否接种第一针疫苗 - */ - private Integer isFirstVaccinate; - /** - * 是否接种第一针疫苗 - */ - private String isFirstVaccinateCn; - - /** - * 是否接种第二针疫苗 - */ - private Integer isSecondVaccinate; - /** - * 是否接种第二针疫苗 - */ - private String isSecondVaccinateCn; - - /** - * 是否接种第三针疫苗 - */ - private Integer isThirdVaccinate; - /** - * 是否接种第三针疫苗 - */ - private String isThirdVaccinateCn; - - private String createtime; - private String createby; - private String updatetime; - private String updateby; - /** - * 0:不活跃,1:活跃 - */ - private Integer isactive; - - /** - * 扩展字段c1 - */ - private String c1; - private String c1Cn; - //更新version字段 - private String c2New; - - /** - * 扩展字段c2 - */ - private String c2; - - /** - * 扩展字段c3 - */ - private String c3; - - /** - * 扩展字段c4 - */ - private String c4; - - /** - * 扩展字段c5 - */ - private String c5; - - private String idsIn; - - private String idcardDesensitization; - - private String phoneDesensitization; - //重点人类型 - private String impUserType; - //多个重点人类型标签 - private JSONObject impUserTypes; - private String impUserTypeCn; - - private String imsi; - - private Boolean isExport; - //人员全息 规则 排序字段： 有图且打好标记的最优先展示 - private String orderByTomany; - /** - * 可信度 - */ - private String reliability; - - //是否重点人 - private String isImpUser; - - //是否全息档案请求 - private String enabledArchives; - -} diff --git a/src/main/java/com/ssf/mysqloracletest/mapper/VillageSendRecordStaticMapper.java b/src/main/java/com/ssf/mysqloracletest/mapper/VillageSendRecordStaticMapper.java deleted file mode 100644 index 09a0c6d..0000000 --- a/src/main/java/com/ssf/mysqloracletest/mapper/VillageSendRecordStaticMapper.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.ssf.mysqloracletest.mapper; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.ssf.mysqloracletest.domain.VillageSendRecordStatic; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; -import java.util.Map; - -@Mapper -@DS("mysql") -public interface VillageSendRecordStaticMapper { - /** - * 插入一条记录 - * - * @return - */ - int insertRecord(VillageSendRecordStatic villageSendRecordStatic); - - /** - * 批量插入 - * - * @return - */ - int insertRecords(List villageSendRecordStatic); - - /** - * 单条更新 - * - * @return - */ - int updateRecord(VillageSendRecordStatic villageSendRecordStatic); - - int updateRecordByTableId(VillageSendRecordStatic villageSendRecordStatic); - - /** - * 查询车辆转发记录表中指定厂家，小区，表，设备，最大的一条已转发记录 - * - * @param map - * @return - */ - Long getMaxTableIdFromVillageSendRecordStatic(Map map); - - /** - * - */ - public List getList(Map map); -} diff --git a/src/main/java/com/ssf/mysqloracletest/mapper/VillageUserInfoMapper.java b/src/main/java/com/ssf/mysqloracletest/mapper/VillageUserInfoMapper.java deleted file mode 100644 index 1b88202..0000000 --- a/src/main/java/com/ssf/mysqloracletest/mapper/VillageUserInfoMapper.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.ssf.mysqloracletest.mapper; - -import com.ssf.mysqloracletest.domain.VillageUserInfo; - -import java.util.List; -import java.util.Map; - -/** - * 住户信息Mapper接口 - * - * @author ruoyi - * @date 2022-05-17 - */ -public interface VillageUserInfoMapper { - /** - * 查询住户信息 - * - * @param id 住户信息主键 - * @return 住户信息 - */ - public VillageUserInfo selectVillageUserInfoById(Long id); - - public VillageUserInfo selectVillageUserInfoByIdcard(String id); - - /** - * 查询住户信息列表 - * - * @param villageUserInfo 住户信息 - * @return 住户信息集合 - */ - public List selectVillageUserInfoList(VillageUserInfo villageUserInfo); - - /** - * 查询住户信息列表 - * - * @param villageUserInfo 住户信息 - * @return 住户信息集合 - */ - public List archivesList(VillageUserInfo villageUserInfo); - - /** - * 新增住户信息 - * - * @param villageUserInfo 住户信息 - * @return 结果 - */ - public int insertVillageUserInfo(VillageUserInfo villageUserInfo); - - public int saveOrUpdate(VillageUserInfo villageUserInfo); - - /** - * 修改住户信息 - * - * @param villageUserInfo 住户信息 - * @return 结果 - */ - public int updateVillageUserInfo(VillageUserInfo villageUserInfo); - - public int updateVillageUserInfoByIdcard(VillageUserInfo bean); - - /** - * 删除住户信息 - * - * @param id 住户信息主键 - * @return 结果 - */ - public int deleteVillageUserInfoById(Long id); - - public int deleteVillageUserInfoByUpdatetime(VillageUserInfo bean); - - /** - * 批量删除住户信息 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteVillageUserInfoByIds(String[] ids); - - /** - * 逻辑删除 - */ - public int logicDelete(Map map); - - /** - * 模型：疑似居住未登记人员功能模块使用 - */ - public int deleteVillageUserInfo(Map map); - - - public List userArchivesTask(VillageUserInfo userInfo); - - public List userArchivesTaskNotIn(VillageUserInfo userInfo); -} diff --git a/src/main/java/com/ssf/mysqloracletest/service/TJksbglMysqlService.java b/src/main/java/com/ssf/mysqloracletest/service/TJksbglMysqlService.java index 2d455a7..e770f3f 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/TJksbglMysqlService.java +++ b/src/main/java/com/ssf/mysqloracletest/service/TJksbglMysqlService.java @@ -13,7 +13,7 @@ public interface TJksbglMysqlService { public TJksbglMysql selectTJksbglById(String id); - public int insertTJksbgl(TJksbglMysql sydz); + public int insertTJksbgl(TJksbglMysql tjks); - public int updateTJksbglById(TJksbglMysql sydz); + public int updateTJksbglById(TJksbglMysql tjks); } diff --git a/src/main/java/com/ssf/mysqloracletest/service/VillageUserInfoService.java b/src/main/java/com/ssf/mysqloracletest/service/VillageUserInfoService.java deleted file mode 100644 index 77913d7..0000000 --- a/src/main/java/com/ssf/mysqloracletest/service/VillageUserInfoService.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.ssf.mysqloracletest.service; - -import com.ssf.mysqloracletest.domain.VillageUserInfo; - -import java.util.List; - -/** - * 住户信息Service接口 - * - * @author ruoyi - * @date 2022-05-17 - */ -public interface VillageUserInfoService { - /** - * 查询住户信息 - * - * @param id 住户信息主键 - * @return 住户信息 - */ - public VillageUserInfo selectVillageUserInfoById(Long id); - - /** - * 查询住户信息列表 - * - * @param villageUserInfo 住户信息 - * @return 住户信息集合 - */ - public List selectVillageUserInfoList(VillageUserInfo villageUserInfo); - - public VillageUserInfo selectVillageUserInfoByIdcard(String idcard); - - /** - * 新增住户信息 - * - * @param villageUserInfo 住户信息 - * @return 结果 - */ - public int insertVillageUserInfo(VillageUserInfo villageUserInfo); - - /** - * 修改住户信息 - * - * @param villageUserInfo 住户信息 - * @return 结果 - */ - public int updateVillageUserInfo(VillageUserInfo villageUserInfo); - - /** - * 批量删除住户信息 - * - * @param ids 需要删除的住户信息主键集合 - * @return 结果 - */ - - public int updateVillageUserInfoByIdcard(VillageUserInfo bean); - - /** - * 删除住户信息信息 - * - * @param id 住户信息主键 - * @return 结果 - */ - public int deleteVillageUserInfoById(Long id); - -} diff --git a/src/main/java/com/ssf/mysqloracletest/service/impl/TJksbglMysqlServiceImpl.java b/src/main/java/com/ssf/mysqloracletest/service/impl/TJksbglMysqlServiceImpl.java index 17da148..fe67773 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/impl/TJksbglMysqlServiceImpl.java +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/TJksbglMysqlServiceImpl.java @@ -22,13 +22,13 @@ public class TJksbglMysqlServiceImpl implements TJksbglMysqlService { } @Override - public int insertTJksbgl(TJksbglMysql bean) { - return tjksbglMysqlMapper.insertTJksbgl(bean); + public int insertTJksbgl(TJksbglMysql tjks) { + return tjksbglMysqlMapper.insertTJksbgl(tjks); } @Override - public int updateTJksbglById(TJksbglMysql bean) { - return tjksbglMysqlMapper.updateTJksbglById(bean); + public int updateTJksbglById(TJksbglMysql tjks) { + return tjksbglMysqlMapper.updateTJksbglById(tjks); } } diff --git a/src/main/java/com/ssf/mysqloracletest/service/impl/VSySyfwMysqlServiceImpl.java b/src/main/java/com/ssf/mysqloracletest/service/impl/VSySyfwMysqlServiceImpl.java index ebe84a8..607cf9e 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/impl/VSySyfwMysqlServiceImpl.java +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/VSySyfwMysqlServiceImpl.java @@ -30,12 +30,12 @@ public class VSySyfwMysqlServiceImpl implements VSySyfwMysqlService { @Override public int insertVSySyfw(VSySyfwMysql syfw) { - return 0; + return sySyfwMysqlMapper.insertVSySyfw(syfw); } @Override public int updateVSySyfwById(VSySyfwMysql syfw) { - return 0; + return sySyfwMysqlMapper.updateVSySyfwById(syfw); } } diff --git a/src/main/java/com/ssf/mysqloracletest/service/impl/VillageUserInfoServiceImpl.java b/src/main/java/com/ssf/mysqloracletest/service/impl/VillageUserInfoServiceImpl.java deleted file mode 100644 index fe6be12..0000000 --- a/src/main/java/com/ssf/mysqloracletest/service/impl/VillageUserInfoServiceImpl.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.ssf.mysqloracletest.service.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.ssf.mysqloracletest.domain.VillageUserInfo; -import com.ssf.mysqloracletest.mapper.VillageUserInfoMapper; -import com.ssf.mysqloracletest.service.VillageUserInfoService; -import com.ssf.mysqloracletest.utils.NumKit; -import com.ssf.mysqloracletest.utils.StringKit; -import lombok.RequiredArgsConstructor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 住户信息Service业务层处理 - * - * @author ruoyi - */ -@Service -@RequiredArgsConstructor -@DS("mysql") -public class VillageUserInfoServiceImpl implements VillageUserInfoService { - private static final Logger logger = LoggerFactory.getLogger(VillageUserInfoServiceImpl.class); - private final VillageUserInfoMapper villageUserInfoMapper; - - /** - * 查询住户信息 - * - * @param id 住户信息主键 - * @return 住户信息 - */ - @Override - public VillageUserInfo selectVillageUserInfoById(Long id) { - VillageUserInfo v = villageUserInfoMapper.selectVillageUserInfoById(id); - return v; - } - - /** - * 查询住户信息列表 - * - * @param villageUserInfo 住户信息 - * @return 住户信息 - */ - @Override - public List selectVillageUserInfoList(VillageUserInfo villageUserInfo) { - //查询之前加密 - List list = villageUserInfoMapper.selectVillageUserInfoList(villageUserInfo); - return list; - } - - - /** - * 新增住户信息 - * - * @param villageUserInfo 住户信息 - * @return 结果 - */ - @Override - public int insertVillageUserInfo(VillageUserInfo villageUserInfo) { - try { - return villageUserInfoMapper.insertVillageUserInfo(villageUserInfo); - } catch (Exception e) { - logger.info(StringKit.getTrace(e)); - return 0; - } - } - - - /** - * 修改住户信息 - * - * @param villageUserInfo 住户信息 - * @return 结果 - */ - @Override - public int updateVillageUserInfo(VillageUserInfo villageUserInfo) { - try { - return villageUserInfoMapper.updateVillageUserInfo(villageUserInfo); - } catch (Exception e) { - logger.info(StringKit.getTrace(e)); - return 0; - } - } - - @Override - public VillageUserInfo selectVillageUserInfoByIdcard(String idcard) { - VillageUserInfo v = villageUserInfoMapper.selectVillageUserInfoByIdcard(idcard); - return v; - } - - - @Override - public int updateVillageUserInfoByIdcard(VillageUserInfo bean) { - VillageUserInfo beanCheck = selectVillageUserInfoByIdcard(bean.getIdcard()); - String versionCheck = StringKit.toString(beanCheck.getC2()); - String c2 = "".equals(bean.getC2()) ? "1" : bean.getC2(); - int version = NumKit.checkInt(c2); - bean.setC2(StringKit.toString(version)); - bean.setC2New(StringKit.toString(version + 1)); - if ("".equals(versionCheck) || c2.equals(versionCheck)) { - return villageUserInfoMapper.updateVillageUserInfoByIdcard(bean); - } - return 0; - } - - - /** - * 删除住户信息信息 - * - */ - @Override - public int deleteVillageUserInfoById(Long id) { - return villageUserInfoMapper.deleteVillageUserInfoById(id); - } - - -} diff --git a/src/main/java/com/ssf/mysqloracletest/utils/ConfigParam.java b/src/main/java/com/ssf/mysqloracletest/utils/ConfigParam.java index be7e840..d03059c 100644 --- a/src/main/java/com/ssf/mysqloracletest/utils/ConfigParam.java +++ b/src/main/java/com/ssf/mysqloracletest/utils/ConfigParam.java @@ -12,6 +12,8 @@ public class ConfigParam { public static String oncesCounts = StringKit.toString(PropertiesUtil.queryPropertiesByKey("oncesCounts")); public static String syfwSwitch = StringKit.toString(PropertiesUtil.queryPropertiesByKey("syfwSwitch")); - public static String jksbSwitch = StringKit.toString(PropertiesUtil.queryPropertiesByKey("jksbSwitch")); public static String syrkSwitch = StringKit.toString(PropertiesUtil.queryPropertiesByKey("syrkSwitch")); + + public static String jksbSwitch = StringKit.toString(PropertiesUtil.queryPropertiesByKey("jksbSwitch")); + }