From 0ce25f34a0d627a5cc0d073d24b8c3e569feac15 Mon Sep 17 00:00:00 2001 From: wujian <14790700720@163.com> Date: 星期五, 22 三月 2024 13:11:53 +0800 Subject: [PATCH] add 整合mybatisplus --- jcdm-main/src/main/java/com/jcdm/main/bs/beatSetting/service/IBsBeatSettingService.java | 4 jcdm-main/src/main/java/com/jcdm/main/rm/repairData/mapper/RmRepairDataMapper.java | 4 jcdm-main/src/main/java/com/jcdm/main/em/inspectionItems/mapper/EmInspectionItemsMapper.java | 4 jcdm-main/src/main/java/com/jcdm/main/bs/material/service/IBsMaterialInfoService.java | 3 jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/mapper/BsFormulaChildInfoMapper.java | 4 jcdm-main/src/main/java/com/jcdm/main/bs/material/mapper/BsMaterialInfoMapper.java | 3 jcdm-main/src/main/java/com/jcdm/main/bs/productBomChild/service/IBsProductBomChildInfoService.java | 3 jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/service/impl/DaOpcuaConfigServiceImpl.java | 3 jcdm-main/src/main/java/com/jcdm/main/em/equipmentStatus/mapper/EmEquipmentStatusMapper.java | 4 jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/service/IDaOpcuaConfigService.java | 3 jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItems/service/IEmInspectionPlanItemsService.java | 4 jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanInfo/mapper/EmInspectionPlanInfoMapper.java | 4 jcdm-main/src/main/java/com/jcdm/main/em/equipmentArchives/mapper/EmEquipmentArchivesMapper.java | 4 jcdm-main/src/main/java/com/jcdm/main/bs/lineInfo/service/impl/BsLineInfoServiceImpl.java | 4 jcdm-main/src/main/java/com/jcdm/main/bs/lineInfo/service/IBsLineInfoService.java | 4 jcdm-main/src/main/java/com/jcdm/main/bs/technologyRouteChild/service/IBsTechnologyRouteChildInfoService.java | 4 jcdm-main/src/main/java/com/jcdm/main/bs/processes/service/IBsProcessesInfoService.java | 4 jcdm-main/src/main/java/com/jcdm/main/om/workReport/mapper/OmWorkReportMapper.java | 4 jcdm-main/src/main/java/com/jcdm/main/bs/formula/service/impl/BsFormulaInfoServiceImpl.java | 4 jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/service/impl/ScStationConfServiceImpl.java | 4 jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlan/service/IEmInspectionPlanService.java | 5 jcdm-common/src/main/java/com/jcdm/common/core/domain/BaseEntity.java | 9 + jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java | 3 jcdm-main/src/main/java/com/jcdm/main/em/inspectionItems/service/impl/EmInspectionItemsServiceImpl.java | 4 jcdm-main/src/main/java/com/jcdm/main/bs/material/service/impl/BsMaterialInfoServiceImpl.java | 4 jcdm-main/src/main/java/com/jcdm/main/bs/productBom/mapper/BsProductBomInfoMapper.java | 3 jcdm-main/src/main/java/com/jcdm/main/bs/technologyRouteChild/service/impl/BsTechnologyRouteChildInfoServiceImpl.java | 4 jcdm-main/src/main/java/com/jcdm/main/rm/repairRecord/service/impl/RmRepairRecordServiceImpl.java | 13 + jcdm-main/src/main/java/com/jcdm/main/em/equipmentArchives/service/impl/EmEquipmentArchivesServiceImpl.java | 4 jcdm-main/src/main/java/com/jcdm/main/em/equipmentStatus/service/IEmEquipmentStatusService.java | 4 jcdm-main/src/main/java/com/jcdm/main/bs/beatSetting/service/impl/BsBeatSettingServiceImpl.java | 4 jcdm-main/src/main/java/com/jcdm/main/rm/repairRecord/mapper/RmRepairRecordMapper.java | 4 jcdm-main/src/main/java/com/jcdm/main/bs/processFile/service/IBsProcessFileService.java | 4 jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanArchives/service/IEmInspectionPlanArchivesService.java | 4 jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanArchives/service/impl/EmInspectionPlanArchivesServiceImpl.java | 4 jcdm-main/src/main/java/com/jcdm/main/rm/repairRecord/service/IRmRepairRecordService.java | 4 jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/service/IScStationConfService.java | 4 jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 3 jcdm-main/src/main/java/com/jcdm/main/bs/productBomChild/mapper/BsProductBomChildInfoMapper.java | 3 jcdm-main/src/main/java/com/jcdm/main/em/inspectionItems/service/IEmInspectionItemsService.java | 4 jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanArchives/mapper/EmInspectionPlanArchivesMapper.java | 4 jcdm-main/src/main/java/com/jcdm/main/bs/workshop/service/IBsWorkshopInfoService.java | 4 jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanInfo/service/IEmInspectionPlanInfoService.java | 4 jcdm-main/src/main/java/com/jcdm/main/bs/formula/service/IBsFormulaInfoService.java | 4 jcdm-main/src/main/java/com/jcdm/main/bs/processFile/mapper/BsProcessFileMapper.java | 4 jcdm-main/src/main/java/com/jcdm/main/bs/productBom/service/impl/BsProductBomInfoServiceImpl.java | 4 jcdm-main/src/main/java/com/jcdm/main/em/equipmentAlarm/service/IEmEquipmentAlarmService.java | 3 jcdm-main/src/main/java/com/jcdm/main/bs/technologyRoute/service/IBsTechnologyRouteInfoService.java | 3 jcdm-main/src/main/java/com/jcdm/main/bs/processes/service/impl/BsProcessesInfoServiceImpl.java | 4 jcdm-main/src/main/java/com/jcdm/main/bs/workshop/service/impl/BsWorkshopInfoServiceImpl.java | 4 jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/IDaPassingStationCollectionService.java | 3 jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java | 3 jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/mapper/ScStationConfMapper.java | 4 jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/mapper/DaOpcuaConfigMapper.java | 3 jcdm-admin/src/main/resources/application.yml | 100 +++++++++++ jcdm-main/src/main/java/com/jcdm/main/bs/lineInfo/mapper/BsLineInfoMapper.java | 4 jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/service/impl/OmProductionOrdeInfoServiceImpl.java | 3 jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java | 3 jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/mapper/DaParamCollectionMapper.java | 3 jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/mapper/OmProductionOrdeInfoMapper.java | 3 jcdm-main/src/main/java/com/jcdm/main/bs/productBomChild/service/impl/BsProductBomChildInfoServiceImpl.java | 3 jcdm-main/src/main/java/com/jcdm/main/rm/repairData/service/IRmRepairDataService.java | 4 jcdm-main/src/main/java/com/jcdm/main/bs/processes/mapper/BsProcessesInfoMapper.java | 3 jcdm-main/src/main/java/com/jcdm/main/bs/technologyRoute/service/impl/BsTechnologyRouteInfoServiceImpl.java | 4 jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/IDaParamCollectionService.java | 3 jcdm-main/src/main/java/com/jcdm/main/bs/productBom/service/IBsProductBomInfoService.java | 3 jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/IBsFormulaChildInfoService.java | 3 jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java | 5 jcdm-main/src/main/java/com/jcdm/main/da/collectionParamConf/service/IDaCollectionParamConfService.java | 3 jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItems/service/impl/EmInspectionPlanItemsServiceImpl.java | 4 jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlan/service/impl/EmInspectionPlanServiceImpl.java | 4 jcdm-main/src/main/java/com/jcdm/main/bs/formula/mapper/BsFormulaInfoMapper.java | 4 jcdm-main/src/main/java/com/jcdm/main/em/equipmentAlarm/mapper/EmEquipmentAlarmMapper.java | 3 jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItems/mapper/EmInspectionPlanItemsMapper.java | 4 jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/mapper/DaPassingStationCollectionMapper.java | 3 jcdm-main/src/main/java/com/jcdm/main/em/equipmentAlarm/service/impl/EmEquipmentAlarmServiceImpl.java | 3 jcdm-main/src/main/java/com/jcdm/main/bs/workshop/mapper/BsWorkshopInfoMapper.java | 4 jcdm-main/src/main/java/com/jcdm/main/da/collectionParamConf/mapper/DaCollectionParamConfMapper.java | 3 jcdm-main/src/main/java/com/jcdm/main/em/equipmentArchives/service/IEmEquipmentArchivesService.java | 4 jcdm-main/src/main/java/com/jcdm/main/bs/processFile/service/impl/BsProcessFileServiceImpl.java | 4 jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/service/IOmProductionOrdeInfoService.java | 3 jcdm-main/src/main/java/com/jcdm/main/rm/repairData/service/impl/RmRepairDataServiceImpl.java | 4 jcdm-main/src/main/java/com/jcdm/main/bs/technologyRoute/mapper/BsTechnologyRouteInfoMapper.java | 3 jcdm-main/src/main/java/com/jcdm/main/bs/technologyRouteChild/mapper/BsTechnologyRouteChildInfoMapper.java | 4 jcdm-framework/src/main/java/com/jcdm/framework/config/MyBatisConfig.java | 32 ++-- jcdm-main/src/main/java/com/jcdm/main/em/equipmentStatus/service/impl/EmEquipmentStatusServiceImpl.java | 4 jcdm-main/src/main/java/com/jcdm/main/bs/beatSetting/mapper/BsBeatSettingMapper.java | 4 jcdm-main/src/main/java/com/jcdm/main/om/workReport/service/impl/OmWorkReportServiceImpl.java | 4 jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlan/mapper/EmInspectionPlanMapper.java | 5 jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanInfo/service/impl/EmInspectionPlanInfoServiceImpl.java | 4 jcdm-main/src/main/java/com/jcdm/main/da/collectionParamConf/service/impl/DaCollectionParamConfServiceImpl.java | 3 jcdm-main/src/main/java/com/jcdm/main/om/workReport/service/IOmWorkReportService.java | 4 92 files changed, 364 insertions(+), 114 deletions(-) diff --git a/jcdm-admin/src/main/resources/application.yml b/jcdm-admin/src/main/resources/application.yml index 551cd0a..989b56e 100644 --- a/jcdm-admin/src/main/resources/application.yml +++ b/jcdm-admin/src/main/resources/application.yml @@ -99,14 +99,100 @@ # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛� expireTime: 30 -# MyBatis閰嶇疆 -mybatis: - # 鎼滅储鎸囧畾鍖呭埆鍚� - typeAliasesPackage: com.jcdm.**.domain - # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢 +## MyBatis閰嶇疆 +#mybatis: +# # 鎼滅储鎸囧畾鍖呭埆鍚� +# typeAliasesPackage: com.jcdm.**.domain +# # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢 +# mapperLocations: classpath*:mapper/**/*Mapper.xml +# # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠� +# configLocation: classpath:mybatis/mybatis-config.xml + + +mybatis-plus: + # 瀵瑰簲鐨� XML 鏂囦欢浣嶇疆 mapperLocations: classpath*:mapper/**/*Mapper.xml - # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠� - configLocation: classpath:mybatis/mybatis-config.xml + # 瀹炰綋鎵弿锛屽涓猵ackage鐢ㄩ�楀彿鎴栬�呭垎鍙峰垎闅� + typeAliasesPackage: com.jcdm.**.domain + # 閽堝 typeAliasesPackage锛屽鏋滈厤缃簡璇ュ睘鎬э紝鍒欎粎浠呬細鎵弿璺緞涓嬩互璇ョ被浣滀负鐖剁被鐨勫煙瀵硅薄 + #typeAliasesSuperType: Class<?> + # 濡傛灉閰嶇疆浜嗚灞炴�э紝SqlSessionFactoryBean 浼氭妸璇ュ寘涓嬮潰鐨勭被娉ㄥ唽涓哄搴旂殑 TypeHandler + #typeHandlersPackage: null + # 濡傛灉閰嶇疆浜嗚灞炴�э紝浼氬皢璺緞涓嬬殑鏋氫妇绫昏繘琛屾敞鍏ワ紝璁╁疄浣撶被瀛楁鑳藉绠�鍗曞揩鎹风殑浣跨敤鏋氫妇灞炴�� + #typeEnumsPackage: null + # 鍚姩鏃舵槸鍚︽鏌� MyBatis XML 鏂囦欢鐨勫瓨鍦紝榛樿涓嶆鏌� + checkConfigLocation: false + # 閫氳繃璇ュ睘鎬у彲鎸囧畾 MyBatis 鐨勬墽琛屽櫒锛孧yBatis 鐨勬墽琛屽櫒鎬诲叡鏈変笁绉嶏細 + # SIMPLE锛氳鎵ц鍣ㄧ被鍨嬩笉鍋氱壒娈婄殑浜嬫儏锛屼负姣忎釜璇彞鐨勬墽琛屽垱寤轰竴涓柊鐨勯澶勭悊璇彞锛圥reparedStatement锛� + # REUSE锛氳鎵ц鍣ㄧ被鍨嬩細澶嶇敤棰勫鐞嗚鍙ワ紙PreparedStatement锛� + # BATCH锛氳鎵ц鍣ㄧ被鍨嬩細鎵归噺鎵ц鎵�鏈夌殑鏇存柊璇彞 + executorType: SIMPLE + configuration: + # 鑷姩椹煎嘲鍛藉悕瑙勫垯锛坈amel case锛夋槧灏� + # 濡傛灉鎮ㄧ殑鏁版嵁搴撳懡鍚嶇鍚堣鍒欐棤闇�浣跨敤 @TableField 娉ㄨВ鎸囧畾鏁版嵁搴撳瓧娈靛悕 + mapUnderscoreToCamelCase: true + # 榛樿鏋氫妇澶勭悊绫�,濡傛灉閰嶇疆浜嗚灞炴��,鏋氫妇灏嗙粺涓�浣跨敤鎸囧畾澶勭悊鍣ㄨ繘琛屽鐞� + # org.apache.ibatis.type.EnumTypeHandler : 瀛樺偍鏋氫妇鐨勫悕绉� + # org.apache.ibatis.type.EnumOrdinalTypeHandler : 瀛樺偍鏋氫妇鐨勭储寮� + # com.baomidou.mybatisplus.extension.handlers.MybatisEnumTypeHandler : 鏋氫妇绫婚渶瑕佸疄鐜癐Enum鎺ュ彛鎴栧瓧娈垫爣璁癅EnumValue娉ㄨВ. + defaultEnumTypeHandler: org.apache.ibatis.type.EnumTypeHandler + # 褰撹缃负 true 鐨勬椂鍊欙紝鎳掑姞杞界殑瀵硅薄鍙兘琚换浣曟噿灞炴�у叏閮ㄥ姞杞斤紝鍚﹀垯锛屾瘡涓睘鎬ч兘鎸夐渶鍔犺浇銆傞渶瑕佸拰 lazyLoadingEnabled 涓�璧蜂娇鐢ㄣ�� + aggressiveLazyLoading: true + # MyBatis 鑷姩鏄犲皠绛栫暐 + # NONE锛氫笉鍚敤鑷姩鏄犲皠 + # PARTIAL锛氬彧瀵归潪宓屽鐨� resultMap 杩涜鑷姩鏄犲皠 + # FULL锛氬鎵�鏈夌殑 resultMap 閮借繘琛岃嚜鍔ㄦ槧灏� + autoMappingBehavior: PARTIAL + # MyBatis 鑷姩鏄犲皠鏃舵湭鐭ュ垪鎴栨湭鐭ュ睘鎬у鐞嗙瓥 + # NONE锛氫笉鍋氫换浣曞鐞� (榛樿鍊�) + # WARNING锛氫互鏃ュ織鐨勫舰寮忔墦鍗扮浉鍏宠鍛婁俊鎭� + # FAILING锛氬綋浣滄槧灏勫け璐ュ鐞嗭紝骞舵姏鍑哄紓甯稿拰璇︾粏淇℃伅 + autoMappingUnknownColumnBehavior: NONE + # Mybatis涓�绾х紦瀛橈紝榛樿涓� SESSION + # SESSION session绾у埆缂撳瓨锛屽悓涓�涓猻ession鐩稿悓鏌ヨ璇彞涓嶄細鍐嶆鏌ヨ鏁版嵁搴� + # STATEMENT 鍏抽棴涓�绾х紦瀛� + localCacheScope: SESSION + # 寮�鍚疢ybatis浜岀骇缂撳瓨锛岄粯璁や负 true + cacheEnabled: true + global-config: + # 鏄惁鎵撳嵃 Logo banner + banner: true + # 鏄惁鍒濆鍖� SqlRunner + enableSqlRunner: false + dbConfig: + # 涓婚敭绫诲瀷 + # AUTO 鏁版嵁搴揑D鑷 + # NONE 绌� + # INPUT 鐢ㄦ埛杈撳叆ID + # ASSIGN_ID 鍏ㄥ眬鍞竴ID + # ASSIGN_UUID 鍏ㄥ眬鍞竴ID UUID + idType: AUTO + # 琛ㄥ悕鍓嶇紑 + tablePrefix: null + # 瀛楁 format,渚�: %s,(瀵逛富閿棤鏁�) + columnFormat: null + # 琛ㄥ悕鏄惁浣跨敤椹煎嘲杞笅鍒掔嚎鍛藉悕,鍙琛ㄥ悕鐢熸晥 + tableUnderline: true + # 澶у啓鍛藉悕,瀵硅〃鍚嶅拰瀛楁鍚嶅潎鐢熸晥 + capitalMode: false + # 鍏ㄥ眬鐨別ntity鐨勯�昏緫鍒犻櫎瀛楁灞炴�у悕 + logicDeleteField: null + # 閫昏緫宸插垹闄ゅ�� + logicDeleteValue: 2 + # 閫昏緫鏈垹闄ゅ�� + logicNotDeleteValue: 0 + # 瀛楁楠岃瘉绛栫暐涔� insert,鍦� insert 鐨勬椂鍊欑殑瀛楁楠岃瘉绛栫暐 + # IGNORED 蹇界暐鍒ゆ柇 + # NOT_NULL 闈濶ULL鍒ゆ柇 + # NOT_EMPTY 闈炵┖鍒ゆ柇(鍙瀛楃涓茬被鍨嬪瓧娈�,鍏朵粬绫诲瀷瀛楁渚濈劧涓洪潪NULL鍒ゆ柇) + # DEFAULT 榛樿鐨�,涓�鑸彧鐢ㄤ簬娉ㄨВ閲� + # NEVER 涓嶅姞鍏� SQL + insertStrategy: NOT_NULL + # 瀛楁楠岃瘉绛栫暐涔� update,鍦� update 鐨勬椂鍊欑殑瀛楁楠岃瘉绛栫暐 + updateStrategy: NOT_NULL + # 瀛楁楠岃瘉绛栫暐涔� select,鍦� select 鐨勬椂鍊欑殑瀛楁楠岃瘉绛栫暐鏃� wrapper 鏍规嵁鍐呴儴 entity 鐢熸垚鐨� where 鏉′欢 + selectStrategy: NOT_NULL + # PageHelper鍒嗛〉鎻掍欢 pagehelper: diff --git a/jcdm-common/src/main/java/com/jcdm/common/core/domain/BaseEntity.java b/jcdm-common/src/main/java/com/jcdm/common/core/domain/BaseEntity.java index 298ec73..328ba61 100644 --- a/jcdm-common/src/main/java/com/jcdm/common/core/domain/BaseEntity.java +++ b/jcdm-common/src/main/java/com/jcdm/common/core/domain/BaseEntity.java @@ -4,6 +4,8 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; + +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; @@ -19,26 +21,33 @@ /** 鎼滅储鍊� */ @JsonIgnore + @TableField(exist = false) private String searchValue; /** 鍒涘缓鑰� */ + @TableField(exist = false) private String createBy; /** 鍒涘缓鏃堕棿 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField(exist = false) private Date createTime; /** 鏇存柊鑰� */ + @TableField(exist = false) private String updateBy; /** 鏇存柊鏃堕棿 */ + @TableField(exist = false) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; /** 澶囨敞 */ + @TableField(exist = false) private String remark; /** 璇锋眰鍙傛暟 */ + @TableField(exist = false) @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map<String, Object> params; diff --git a/jcdm-framework/src/main/java/com/jcdm/framework/config/MyBatisConfig.java b/jcdm-framework/src/main/java/com/jcdm/framework/config/MyBatisConfig.java index d1c06d5..67db187 100644 --- a/jcdm-framework/src/main/java/com/jcdm/framework/config/MyBatisConfig.java +++ b/jcdm-framework/src/main/java/com/jcdm/framework/config/MyBatisConfig.java @@ -113,20 +113,20 @@ return resources.toArray(new Resource[resources.size()]); } - @Bean - public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception - { - String typeAliasesPackage = env.getProperty("mybatis.typeAliasesPackage"); - String mapperLocations = env.getProperty("mybatis.mapperLocations"); - String configLocation = env.getProperty("mybatis.configLocation"); - typeAliasesPackage = setTypeAliasesPackage(typeAliasesPackage); - VFS.addImplClass(SpringBootVFS.class); - - final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean(); - sessionFactory.setDataSource(dataSource); - sessionFactory.setTypeAliasesPackage(typeAliasesPackage); - sessionFactory.setMapperLocations(resolveMapperLocations(StringUtils.split(mapperLocations, ","))); - sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation)); - return sessionFactory.getObject(); - } +// @Bean +// public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception +// { +// String typeAliasesPackage = env.getProperty("mybatis.typeAliasesPackage"); +// String mapperLocations = env.getProperty("mybatis.mapperLocations"); +// String configLocation = env.getProperty("mybatis.configLocation"); +// typeAliasesPackage = setTypeAliasesPackage(typeAliasesPackage); +// VFS.addImplClass(SpringBootVFS.class); +// +// final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean(); +// sessionFactory.setDataSource(dataSource); +// sessionFactory.setTypeAliasesPackage(typeAliasesPackage); +// sessionFactory.setMapperLocations(resolveMapperLocations(StringUtils.split(mapperLocations, ","))); +// sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation)); +// return sessionFactory.getObject(); +// } } \ No newline at end of file diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/beatSetting/mapper/BsBeatSettingMapper.java b/jcdm-main/src/main/java/com/jcdm/main/bs/beatSetting/mapper/BsBeatSettingMapper.java index c5c6918..20cf54e 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/beatSetting/mapper/BsBeatSettingMapper.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/beatSetting/mapper/BsBeatSettingMapper.java @@ -1,6 +1,8 @@ package com.jcdm.main.bs.beatSetting.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jcdm.main.bs.beatSetting.domain.BsBeatSetting; /** @@ -9,7 +11,7 @@ * @author Yi * @date 2024-01-05 */ -public interface BsBeatSettingMapper +public interface BsBeatSettingMapper extends BaseMapper<BsBeatSetting> { /** * 鏌ヨ鑺傛媿璁剧疆 diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/beatSetting/service/IBsBeatSettingService.java b/jcdm-main/src/main/java/com/jcdm/main/bs/beatSetting/service/IBsBeatSettingService.java index 988143b..4651930 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/beatSetting/service/IBsBeatSettingService.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/beatSetting/service/IBsBeatSettingService.java @@ -1,6 +1,8 @@ package com.jcdm.main.bs.beatSetting.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; import com.jcdm.main.bs.beatSetting.domain.BsBeatSetting; /** @@ -9,7 +11,7 @@ * @author Yi * @date 2024-01-05 */ -public interface IBsBeatSettingService +public interface IBsBeatSettingService extends IService<BsBeatSetting> { /** * 鏌ヨ鑺傛媿璁剧疆 diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/beatSetting/service/impl/BsBeatSettingServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/bs/beatSetting/service/impl/BsBeatSettingServiceImpl.java index a2c19a0..bb94b12 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/beatSetting/service/impl/BsBeatSettingServiceImpl.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/beatSetting/service/impl/BsBeatSettingServiceImpl.java @@ -1,6 +1,8 @@ package com.jcdm.main.bs.beatSetting.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jcdm.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -15,7 +17,7 @@ * @date 2024-01-05 */ @Service -public class BsBeatSettingServiceImpl implements IBsBeatSettingService +public class BsBeatSettingServiceImpl extends ServiceImpl<BsBeatSettingMapper,BsBeatSetting> implements IBsBeatSettingService { @Autowired private BsBeatSettingMapper bsBeatSettingMapper; diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/formula/mapper/BsFormulaInfoMapper.java b/jcdm-main/src/main/java/com/jcdm/main/bs/formula/mapper/BsFormulaInfoMapper.java index 1105014..87714d0 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/formula/mapper/BsFormulaInfoMapper.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/formula/mapper/BsFormulaInfoMapper.java @@ -1,6 +1,8 @@ package com.jcdm.main.bs.formula.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jcdm.main.bs.formula.domain.BsFormulaInfo; /** @@ -9,7 +11,7 @@ * @author ruimin * @date 2023-12-26 */ -public interface BsFormulaInfoMapper +public interface BsFormulaInfoMapper extends BaseMapper<BsFormulaInfo> { /** * 鏌ヨ閰嶆柟閰嶇疆 diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/formula/service/IBsFormulaInfoService.java b/jcdm-main/src/main/java/com/jcdm/main/bs/formula/service/IBsFormulaInfoService.java index a525e95..e5c1fdd 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/formula/service/IBsFormulaInfoService.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/formula/service/IBsFormulaInfoService.java @@ -1,6 +1,8 @@ package com.jcdm.main.bs.formula.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; import com.jcdm.main.bs.formula.domain.BsFormulaInfo; /** @@ -9,7 +11,7 @@ * @author ruimin * @date 2023-12-26 */ -public interface IBsFormulaInfoService +public interface IBsFormulaInfoService extends IService<BsFormulaInfo> { /** * 鏌ヨ閰嶆柟閰嶇疆 diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/formula/service/impl/BsFormulaInfoServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/bs/formula/service/impl/BsFormulaInfoServiceImpl.java index 00b3873..5ef26dd 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/formula/service/impl/BsFormulaInfoServiceImpl.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/formula/service/impl/BsFormulaInfoServiceImpl.java @@ -1,6 +1,8 @@ package com.jcdm.main.bs.formula.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jcdm.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -15,7 +17,7 @@ * @date 2023-12-26 */ @Service -public class BsFormulaInfoServiceImpl implements IBsFormulaInfoService +public class BsFormulaInfoServiceImpl extends ServiceImpl<BsFormulaInfoMapper,BsFormulaInfo> implements IBsFormulaInfoService { @Autowired private BsFormulaInfoMapper bsFormulaInfoMapper; diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/mapper/BsFormulaChildInfoMapper.java b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/mapper/BsFormulaChildInfoMapper.java index 8d4eb4c..c42b46b 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/mapper/BsFormulaChildInfoMapper.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/mapper/BsFormulaChildInfoMapper.java @@ -1,6 +1,8 @@ package com.jcdm.main.bs.formulaChild.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jcdm.main.bs.formulaChild.domain.BsFormulaChildInfo; import org.springframework.data.repository.query.Param; @@ -10,7 +12,7 @@ * @author ruimin * @date 2023-12-26 */ -public interface BsFormulaChildInfoMapper +public interface BsFormulaChildInfoMapper extends BaseMapper<BsFormulaChildInfo> { /** * 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭� diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/IBsFormulaChildInfoService.java b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/IBsFormulaChildInfoService.java index ac3573b..e83c15d 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/IBsFormulaChildInfoService.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/IBsFormulaChildInfoService.java @@ -2,6 +2,7 @@ import java.util.List; +import com.baomidou.mybatisplus.extension.service.IService; import com.jcdm.common.core.domain.AjaxResult; import com.jcdm.main.bs.formulaChild.domain.BsFormulaChildInfo; import org.springframework.data.repository.query.Param; @@ -12,7 +13,7 @@ * @author ruimin * @date 2023-12-26 */ -public interface IBsFormulaChildInfoService +public interface IBsFormulaChildInfoService extends IService<BsFormulaChildInfo> { /** * 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭� diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java index 5548c31..c9cde25 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Map; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jcdm.common.core.domain.AjaxResult; import com.jcdm.common.utils.DateUtils; import com.jcdm.framework.websocket.WebSocketUsers; @@ -29,7 +30,7 @@ * @date 2023-12-26 */ @Service -public class BsFormulaChildInfoServiceImpl implements IBsFormulaChildInfoService +public class BsFormulaChildInfoServiceImpl extends ServiceImpl<BsFormulaChildInfoMapper,BsFormulaChildInfo> implements IBsFormulaChildInfoService { @Autowired private BsFormulaChildInfoMapper bsFormulaChildInfoMapper; diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/lineInfo/mapper/BsLineInfoMapper.java b/jcdm-main/src/main/java/com/jcdm/main/bs/lineInfo/mapper/BsLineInfoMapper.java index 40c3c7d..b312b8c 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/lineInfo/mapper/BsLineInfoMapper.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/lineInfo/mapper/BsLineInfoMapper.java @@ -1,6 +1,8 @@ package com.jcdm.main.bs.lineInfo.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jcdm.main.bs.lineInfo.domain.BsLineInfo; /** @@ -9,7 +11,7 @@ * @author Yi * @date 2023-12-09 */ -public interface BsLineInfoMapper +public interface BsLineInfoMapper extends BaseMapper<BsLineInfo> { /** * 鏌ヨ浜х嚎淇℃伅 diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/lineInfo/service/IBsLineInfoService.java b/jcdm-main/src/main/java/com/jcdm/main/bs/lineInfo/service/IBsLineInfoService.java index d96dc2d..2e2ee76 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/lineInfo/service/IBsLineInfoService.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/lineInfo/service/IBsLineInfoService.java @@ -1,6 +1,8 @@ package com.jcdm.main.bs.lineInfo.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; import com.jcdm.main.bs.lineInfo.domain.BsLineInfo; /** @@ -9,7 +11,7 @@ * @author Yi * @date 2023-12-09 */ -public interface IBsLineInfoService +public interface IBsLineInfoService extends IService<BsLineInfo> { /** * 鏌ヨ浜х嚎淇℃伅 diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/lineInfo/service/impl/BsLineInfoServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/bs/lineInfo/service/impl/BsLineInfoServiceImpl.java index c396b16..2fc02db 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/lineInfo/service/impl/BsLineInfoServiceImpl.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/lineInfo/service/impl/BsLineInfoServiceImpl.java @@ -1,6 +1,8 @@ package com.jcdm.main.bs.lineInfo.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jcdm.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -17,7 +19,7 @@ * @date 2023-12-09 */ @Service -public class BsLineInfoServiceImpl implements IBsLineInfoService +public class BsLineInfoServiceImpl extends ServiceImpl<BsLineInfoMapper,BsLineInfo> implements IBsLineInfoService { @Autowired private BsLineInfoMapper bsLineInfoMapper; diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/material/mapper/BsMaterialInfoMapper.java b/jcdm-main/src/main/java/com/jcdm/main/bs/material/mapper/BsMaterialInfoMapper.java index 7f38b9d..9d5d91b 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/material/mapper/BsMaterialInfoMapper.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/material/mapper/BsMaterialInfoMapper.java @@ -1,5 +1,6 @@ package com.jcdm.main.bs.material.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jcdm.main.bs.material.domain.BsMaterialInfo; import java.util.List; @@ -10,7 +11,7 @@ * @author yyt * @date 2023-12-09 */ -public interface BsMaterialInfoMapper +public interface BsMaterialInfoMapper extends BaseMapper<BsMaterialInfo> { /** * 鏌ヨ鐗╂枡淇℃伅 diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/material/service/IBsMaterialInfoService.java b/jcdm-main/src/main/java/com/jcdm/main/bs/material/service/IBsMaterialInfoService.java index 33f18f0..318b0b9 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/material/service/IBsMaterialInfoService.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/material/service/IBsMaterialInfoService.java @@ -1,5 +1,6 @@ package com.jcdm.main.bs.material.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.jcdm.main.bs.material.domain.BsMaterialInfo; import java.util.List; @@ -10,7 +11,7 @@ * @author yyt * @date 2023-12-09 */ -public interface IBsMaterialInfoService +public interface IBsMaterialInfoService extends IService<BsMaterialInfo> { /** * 鏌ヨ鐗╂枡淇℃伅 diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/material/service/impl/BsMaterialInfoServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/bs/material/service/impl/BsMaterialInfoServiceImpl.java index bd47eef..211d0ec 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/material/service/impl/BsMaterialInfoServiceImpl.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/material/service/impl/BsMaterialInfoServiceImpl.java @@ -1,6 +1,8 @@ package com.jcdm.main.bs.material.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jcdm.common.utils.DateUtils; import com.jcdm.main.bs.material.domain.BsMaterialInfo; import com.jcdm.main.bs.material.mapper.BsMaterialInfoMapper; @@ -15,7 +17,7 @@ * @date 2023-12-09 */ @Service -public class BsMaterialInfoServiceImpl implements IBsMaterialInfoService +public class BsMaterialInfoServiceImpl extends ServiceImpl<BsMaterialInfoMapper,BsMaterialInfo> implements IBsMaterialInfoService { @Autowired private BsMaterialInfoMapper bsMaterialInfoMapper; diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/processFile/mapper/BsProcessFileMapper.java b/jcdm-main/src/main/java/com/jcdm/main/bs/processFile/mapper/BsProcessFileMapper.java index 6db02aa..e2d16de 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/processFile/mapper/BsProcessFileMapper.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/processFile/mapper/BsProcessFileMapper.java @@ -1,6 +1,8 @@ package com.jcdm.main.bs.processFile.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jcdm.main.bs.processFile.domain.BsProcessFile; /** @@ -9,7 +11,7 @@ * @author Yi * @date 2024-01-03 */ -public interface BsProcessFileMapper +public interface BsProcessFileMapper extends BaseMapper<BsProcessFile> { /** * 鏌ヨ宸ヨ壓鏂囨。 diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/processFile/service/IBsProcessFileService.java b/jcdm-main/src/main/java/com/jcdm/main/bs/processFile/service/IBsProcessFileService.java index 075a8b4..36ab51c 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/processFile/service/IBsProcessFileService.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/processFile/service/IBsProcessFileService.java @@ -1,6 +1,8 @@ package com.jcdm.main.bs.processFile.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; import com.jcdm.main.bs.processFile.domain.BsProcessFile; /** @@ -9,7 +11,7 @@ * @author Yi * @date 2024-01-03 */ -public interface IBsProcessFileService +public interface IBsProcessFileService extends IService<BsProcessFile> { /** * 鏌ヨ宸ヨ壓鏂囨。 diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/processFile/service/impl/BsProcessFileServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/bs/processFile/service/impl/BsProcessFileServiceImpl.java index 9d05656..7ea5327 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/processFile/service/impl/BsProcessFileServiceImpl.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/processFile/service/impl/BsProcessFileServiceImpl.java @@ -1,6 +1,8 @@ package com.jcdm.main.bs.processFile.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jcdm.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -15,7 +17,7 @@ * @date 2024-01-03 */ @Service -public class BsProcessFileServiceImpl implements IBsProcessFileService +public class BsProcessFileServiceImpl extends ServiceImpl<BsProcessFileMapper,BsProcessFile> implements IBsProcessFileService { @Autowired private BsProcessFileMapper bsProcessFileMapper; diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/processes/mapper/BsProcessesInfoMapper.java b/jcdm-main/src/main/java/com/jcdm/main/bs/processes/mapper/BsProcessesInfoMapper.java index a0161a6..47cfe35 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/processes/mapper/BsProcessesInfoMapper.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/processes/mapper/BsProcessesInfoMapper.java @@ -1,5 +1,6 @@ package com.jcdm.main.bs.processes.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jcdm.main.bs.processes.domain.BsProcessesInfo; import java.util.List; @@ -10,7 +11,7 @@ * @author ruimin * @date 2023-12-09 */ -public interface BsProcessesInfoMapper +public interface BsProcessesInfoMapper extends BaseMapper<BsProcessesInfo> { /** * 鏌ヨ宸ュ簭淇℃伅 diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/processes/service/IBsProcessesInfoService.java b/jcdm-main/src/main/java/com/jcdm/main/bs/processes/service/IBsProcessesInfoService.java index c515f80..7b648c4 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/processes/service/IBsProcessesInfoService.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/processes/service/IBsProcessesInfoService.java @@ -1,5 +1,7 @@ package com.jcdm.main.bs.processes.service; +import com.baomidou.mybatisplus.extension.service.IService; +import com.jcdm.main.bs.material.domain.BsMaterialInfo; import com.jcdm.main.bs.processes.domain.BsProcessesInfo; import java.util.List; @@ -10,7 +12,7 @@ * @author ruimin * @date 2023-12-09 */ -public interface IBsProcessesInfoService +public interface IBsProcessesInfoService extends IService<BsProcessesInfo> { /** * 鏌ヨ宸ュ簭淇℃伅 diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/processes/service/impl/BsProcessesInfoServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/bs/processes/service/impl/BsProcessesInfoServiceImpl.java index 93b083b..31eaff9 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/processes/service/impl/BsProcessesInfoServiceImpl.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/processes/service/impl/BsProcessesInfoServiceImpl.java @@ -1,6 +1,8 @@ package com.jcdm.main.bs.processes.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jcdm.common.utils.DateUtils; import com.jcdm.main.bs.processes.domain.BsProcessesInfo; import com.jcdm.main.bs.processes.mapper.BsProcessesInfoMapper; @@ -17,7 +19,7 @@ * @date 2023-12-09 */ @Service -public class BsProcessesInfoServiceImpl implements IBsProcessesInfoService +public class BsProcessesInfoServiceImpl extends ServiceImpl<BsProcessesInfoMapper,BsProcessesInfo> implements IBsProcessesInfoService { @Autowired private BsProcessesInfoMapper bsProcessesInfoMapper; diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/productBom/mapper/BsProductBomInfoMapper.java b/jcdm-main/src/main/java/com/jcdm/main/bs/productBom/mapper/BsProductBomInfoMapper.java index 4a18d64..c29e08a 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/productBom/mapper/BsProductBomInfoMapper.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/productBom/mapper/BsProductBomInfoMapper.java @@ -1,5 +1,6 @@ package com.jcdm.main.bs.productBom.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jcdm.main.bs.productBom.domain.BsProductBomInfo; @@ -11,7 +12,7 @@ * @author yyt * @date 2023-12-11 */ -public interface BsProductBomInfoMapper +public interface BsProductBomInfoMapper extends BaseMapper<BsProductBomInfo> { /** * 鏌ヨ鍩虹BOM diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/productBom/service/IBsProductBomInfoService.java b/jcdm-main/src/main/java/com/jcdm/main/bs/productBom/service/IBsProductBomInfoService.java index 7867bb9..4182494 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/productBom/service/IBsProductBomInfoService.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/productBom/service/IBsProductBomInfoService.java @@ -1,5 +1,6 @@ package com.jcdm.main.bs.productBom.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.jcdm.main.bs.productBom.domain.BsProductBomInfo; import java.util.List; @@ -10,7 +11,7 @@ * @author yyt * @date 2023-12-11 */ -public interface IBsProductBomInfoService +public interface IBsProductBomInfoService extends IService<BsProductBomInfo> { /** * 鏌ヨ鍩虹BOM diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/productBom/service/impl/BsProductBomInfoServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/bs/productBom/service/impl/BsProductBomInfoServiceImpl.java index 7051fb7..830ddc7 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/productBom/service/impl/BsProductBomInfoServiceImpl.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/productBom/service/impl/BsProductBomInfoServiceImpl.java @@ -1,6 +1,8 @@ package com.jcdm.main.bs.productBom.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jcdm.common.utils.DateUtils; import com.jcdm.main.bs.productBom.domain.BsProductBomInfo; import com.jcdm.main.bs.productBom.mapper.BsProductBomInfoMapper; @@ -16,7 +18,7 @@ * @date 2023-12-11 */ @Service -public class BsProductBomInfoServiceImpl implements IBsProductBomInfoService +public class BsProductBomInfoServiceImpl extends ServiceImpl<BsProductBomInfoMapper,BsProductBomInfo> implements IBsProductBomInfoService { @Autowired private BsProductBomInfoMapper bsProductBomInfoMapper; diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/productBomChild/mapper/BsProductBomChildInfoMapper.java b/jcdm-main/src/main/java/com/jcdm/main/bs/productBomChild/mapper/BsProductBomChildInfoMapper.java index 437d525..9f47250 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/productBomChild/mapper/BsProductBomChildInfoMapper.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/productBomChild/mapper/BsProductBomChildInfoMapper.java @@ -1,5 +1,6 @@ package com.jcdm.main.bs.productBomChild.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jcdm.main.bs.productBomChild.domain.BsProductBomChildInfo; import java.util.List; @@ -10,7 +11,7 @@ * @author yyt * @date 2023-12-11 */ -public interface BsProductBomChildInfoMapper +public interface BsProductBomChildInfoMapper extends BaseMapper<BsProductBomChildInfo> { /** * 鏌ヨ鍩虹BOM瀛愪俊鎭� diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/productBomChild/service/IBsProductBomChildInfoService.java b/jcdm-main/src/main/java/com/jcdm/main/bs/productBomChild/service/IBsProductBomChildInfoService.java index 96e414e..9a07a56 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/productBomChild/service/IBsProductBomChildInfoService.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/productBomChild/service/IBsProductBomChildInfoService.java @@ -1,5 +1,6 @@ package com.jcdm.main.bs.productBomChild.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.jcdm.main.bs.productBomChild.domain.BsProductBomChildInfo; import java.util.List; @@ -11,7 +12,7 @@ * @author yyt * @date 2023-12-11 */ -public interface IBsProductBomChildInfoService +public interface IBsProductBomChildInfoService extends IService<BsProductBomChildInfo> { /** * 鏌ヨ鍩虹BOM瀛愪俊鎭� diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/productBomChild/service/impl/BsProductBomChildInfoServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/bs/productBomChild/service/impl/BsProductBomChildInfoServiceImpl.java index a8abeb0..1da5963 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/productBomChild/service/impl/BsProductBomChildInfoServiceImpl.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/productBomChild/service/impl/BsProductBomChildInfoServiceImpl.java @@ -2,6 +2,7 @@ import java.util.List; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jcdm.main.bs.productBomChild.domain.BsProductBomChildInfo; import com.jcdm.main.bs.productBomChild.mapper.BsProductBomChildInfoMapper; import com.jcdm.main.bs.productBomChild.service.IBsProductBomChildInfoService; @@ -15,7 +16,7 @@ * @date 2023-12-11 */ @Service -public class BsProductBomChildInfoServiceImpl implements IBsProductBomChildInfoService +public class BsProductBomChildInfoServiceImpl extends ServiceImpl<BsProductBomChildInfoMapper,BsProductBomChildInfo> implements IBsProductBomChildInfoService { @Autowired private BsProductBomChildInfoMapper bsProductBomChildInfoMapper; diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/technologyRoute/mapper/BsTechnologyRouteInfoMapper.java b/jcdm-main/src/main/java/com/jcdm/main/bs/technologyRoute/mapper/BsTechnologyRouteInfoMapper.java index 0e072c7..7e8bc20 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/technologyRoute/mapper/BsTechnologyRouteInfoMapper.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/technologyRoute/mapper/BsTechnologyRouteInfoMapper.java @@ -1,5 +1,6 @@ package com.jcdm.main.bs.technologyRoute.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jcdm.main.bs.technologyRoute.domain.BsTechnologyRouteInfo; import java.util.List; @@ -10,7 +11,7 @@ * @author ruimin * @date 2023-12-09 */ -public interface BsTechnologyRouteInfoMapper +public interface BsTechnologyRouteInfoMapper extends BaseMapper<BsTechnologyRouteInfo> { /** * 鏌ヨ宸ヨ壓娴佺▼ diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/technologyRoute/service/IBsTechnologyRouteInfoService.java b/jcdm-main/src/main/java/com/jcdm/main/bs/technologyRoute/service/IBsTechnologyRouteInfoService.java index 763724c..f2e0555 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/technologyRoute/service/IBsTechnologyRouteInfoService.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/technologyRoute/service/IBsTechnologyRouteInfoService.java @@ -1,5 +1,6 @@ package com.jcdm.main.bs.technologyRoute.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.jcdm.main.bs.technologyRoute.domain.BsTechnologyRouteInfo; import java.util.List; @@ -10,7 +11,7 @@ * @author ruimin * @date 2023-12-09 */ -public interface IBsTechnologyRouteInfoService +public interface IBsTechnologyRouteInfoService extends IService<BsTechnologyRouteInfo> { /** * 鏌ヨ宸ヨ壓娴佺▼ diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/technologyRoute/service/impl/BsTechnologyRouteInfoServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/bs/technologyRoute/service/impl/BsTechnologyRouteInfoServiceImpl.java index 6d856b0..d949a84 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/technologyRoute/service/impl/BsTechnologyRouteInfoServiceImpl.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/technologyRoute/service/impl/BsTechnologyRouteInfoServiceImpl.java @@ -1,6 +1,8 @@ package com.jcdm.main.bs.technologyRoute.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jcdm.common.utils.DateUtils; import com.jcdm.main.bs.domain.BsTechnologyRouteChildInfo; import com.jcdm.main.bs.technologyRoute.domain.BsTechnologyRouteInfo; @@ -19,7 +21,7 @@ * @date 2023-12-09 */ @Service -public class BsTechnologyRouteInfoServiceImpl implements IBsTechnologyRouteInfoService +public class BsTechnologyRouteInfoServiceImpl extends ServiceImpl<BsTechnologyRouteInfoMapper,BsTechnologyRouteInfo> implements IBsTechnologyRouteInfoService { @Autowired private BsTechnologyRouteInfoMapper bsTechnologyRouteInfoMapper; diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/technologyRouteChild/mapper/BsTechnologyRouteChildInfoMapper.java b/jcdm-main/src/main/java/com/jcdm/main/bs/technologyRouteChild/mapper/BsTechnologyRouteChildInfoMapper.java index fc09dd9..5b289ba 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/technologyRouteChild/mapper/BsTechnologyRouteChildInfoMapper.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/technologyRouteChild/mapper/BsTechnologyRouteChildInfoMapper.java @@ -1,6 +1,8 @@ package com.jcdm.main.bs.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jcdm.main.bs.domain.BsTechnologyRouteChildInfo; /** @@ -9,7 +11,7 @@ * @author ruimin * @date 2023-12-09 */ -public interface BsTechnologyRouteChildInfoMapper +public interface BsTechnologyRouteChildInfoMapper extends BaseMapper<BsTechnologyRouteChildInfo> { /** * 鏌ヨ宸ヨ壓璺嚎瀛愪俊鎭� diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/technologyRouteChild/service/IBsTechnologyRouteChildInfoService.java b/jcdm-main/src/main/java/com/jcdm/main/bs/technologyRouteChild/service/IBsTechnologyRouteChildInfoService.java index ee3c274..553d5c9 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/technologyRouteChild/service/IBsTechnologyRouteChildInfoService.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/technologyRouteChild/service/IBsTechnologyRouteChildInfoService.java @@ -1,6 +1,8 @@ package com.jcdm.main.bs.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; import com.jcdm.main.bs.domain.BsTechnologyRouteChildInfo; /** @@ -9,7 +11,7 @@ * @author ruimin * @date 2023-12-09 */ -public interface IBsTechnologyRouteChildInfoService +public interface IBsTechnologyRouteChildInfoService extends IService<BsTechnologyRouteChildInfo> { /** * 鏌ヨ宸ヨ壓璺嚎瀛愪俊鎭� diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/technologyRouteChild/service/impl/BsTechnologyRouteChildInfoServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/bs/technologyRouteChild/service/impl/BsTechnologyRouteChildInfoServiceImpl.java index 25a5783..8dffb3b 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/technologyRouteChild/service/impl/BsTechnologyRouteChildInfoServiceImpl.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/technologyRouteChild/service/impl/BsTechnologyRouteChildInfoServiceImpl.java @@ -1,6 +1,8 @@ package com.jcdm.main.bs.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jcdm.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -17,7 +19,7 @@ * @date 2023-12-09 */ @Service -public class BsTechnologyRouteChildInfoServiceImpl implements IBsTechnologyRouteChildInfoService +public class BsTechnologyRouteChildInfoServiceImpl extends ServiceImpl<BsTechnologyRouteChildInfoMapper,BsTechnologyRouteChildInfo> implements IBsTechnologyRouteChildInfoService { @Autowired private BsTechnologyRouteChildInfoMapper bsTechnologyRouteChildInfoMapper; diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/workshop/mapper/BsWorkshopInfoMapper.java b/jcdm-main/src/main/java/com/jcdm/main/bs/workshop/mapper/BsWorkshopInfoMapper.java index a840d42..2b1df58 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/workshop/mapper/BsWorkshopInfoMapper.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/workshop/mapper/BsWorkshopInfoMapper.java @@ -1,6 +1,8 @@ package com.jcdm.main.bs.workshop.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jcdm.main.bs.workshop.domain.BsWorkshopInfo; /** @@ -9,7 +11,7 @@ * @author jc * @date 2023-12-06 */ -public interface BsWorkshopInfoMapper +public interface BsWorkshopInfoMapper extends BaseMapper<BsWorkshopInfo> { /** * 鏌ヨ杞﹂棿淇℃伅 diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/workshop/service/IBsWorkshopInfoService.java b/jcdm-main/src/main/java/com/jcdm/main/bs/workshop/service/IBsWorkshopInfoService.java index 11a57da..899d015 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/workshop/service/IBsWorkshopInfoService.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/workshop/service/IBsWorkshopInfoService.java @@ -1,6 +1,8 @@ package com.jcdm.main.bs.workshop.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; import com.jcdm.main.bs.workshop.domain.BsWorkshopInfo; /** @@ -9,7 +11,7 @@ * @author jc * @date 2023-12-06 */ -public interface IBsWorkshopInfoService +public interface IBsWorkshopInfoService extends IService<BsWorkshopInfo> { /** * 鏌ヨ杞﹂棿淇℃伅 diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/workshop/service/impl/BsWorkshopInfoServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/bs/workshop/service/impl/BsWorkshopInfoServiceImpl.java index 00bc99a..b3d3a7c 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/workshop/service/impl/BsWorkshopInfoServiceImpl.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/workshop/service/impl/BsWorkshopInfoServiceImpl.java @@ -1,6 +1,8 @@ package com.jcdm.main.bs.workshop.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jcdm.common.utils.DateUtils; import com.jcdm.main.bs.workshop.service.IBsWorkshopInfoService; import org.springframework.beans.factory.annotation.Autowired; @@ -17,7 +19,7 @@ * @date 2023-12-06 */ @Service -public class BsWorkshopInfoServiceImpl implements IBsWorkshopInfoService +public class BsWorkshopInfoServiceImpl extends ServiceImpl<BsWorkshopInfoMapper,BsWorkshopInfo> implements IBsWorkshopInfoService { @Autowired private BsWorkshopInfoMapper bsWorkshopInfoMapper; diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/collectionParamConf/mapper/DaCollectionParamConfMapper.java b/jcdm-main/src/main/java/com/jcdm/main/da/collectionParamConf/mapper/DaCollectionParamConfMapper.java index eec648d..b908bb9 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/da/collectionParamConf/mapper/DaCollectionParamConfMapper.java +++ b/jcdm-main/src/main/java/com/jcdm/main/da/collectionParamConf/mapper/DaCollectionParamConfMapper.java @@ -1,5 +1,6 @@ package com.jcdm.main.da.collectionParamConf.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jcdm.main.da.collectionParamConf.domain.DaCollectionParamConf; import java.util.List; @@ -10,7 +11,7 @@ * @author ruimin * @date 2023-12-25 */ -public interface DaCollectionParamConfMapper +public interface DaCollectionParamConfMapper extends BaseMapper<DaCollectionParamConf> { /** * 鏌ヨ閲囬泦鍙傛暟閰嶇疆 diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/collectionParamConf/service/IDaCollectionParamConfService.java b/jcdm-main/src/main/java/com/jcdm/main/da/collectionParamConf/service/IDaCollectionParamConfService.java index 8ea5aad..221b360 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/da/collectionParamConf/service/IDaCollectionParamConfService.java +++ b/jcdm-main/src/main/java/com/jcdm/main/da/collectionParamConf/service/IDaCollectionParamConfService.java @@ -1,5 +1,6 @@ package com.jcdm.main.da.collectionParamConf.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.jcdm.main.da.collectionParamConf.domain.DaCollectionParamConf; import java.util.List; @@ -10,7 +11,7 @@ * @author ruimin * @date 2023-12-25 */ -public interface IDaCollectionParamConfService +public interface IDaCollectionParamConfService extends IService<DaCollectionParamConf> { /** * 鏌ヨ閲囬泦鍙傛暟閰嶇疆 diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/collectionParamConf/service/impl/DaCollectionParamConfServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/da/collectionParamConf/service/impl/DaCollectionParamConfServiceImpl.java index fc64873..fd94e7d 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/da/collectionParamConf/service/impl/DaCollectionParamConfServiceImpl.java +++ b/jcdm-main/src/main/java/com/jcdm/main/da/collectionParamConf/service/impl/DaCollectionParamConfServiceImpl.java @@ -1,5 +1,6 @@ package com.jcdm.main.da.collectionParamConf.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jcdm.common.utils.DateUtils; import com.jcdm.main.da.collectionParamConf.domain.DaCollectionParamConf; import com.jcdm.main.da.collectionParamConf.mapper.DaCollectionParamConfMapper; @@ -16,7 +17,7 @@ * @date 2023-12-25 */ @Service -public class DaCollectionParamConfServiceImpl implements IDaCollectionParamConfService +public class DaCollectionParamConfServiceImpl extends ServiceImpl<DaCollectionParamConfMapper,DaCollectionParamConf> implements IDaCollectionParamConfService { @Autowired private DaCollectionParamConfMapper daCollectionParamConfMapper; diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/mapper/DaOpcuaConfigMapper.java b/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/mapper/DaOpcuaConfigMapper.java index 7feb41d..de0cd38 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/mapper/DaOpcuaConfigMapper.java +++ b/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/mapper/DaOpcuaConfigMapper.java @@ -1,5 +1,6 @@ package com.jcdm.main.da.opcuaconfig.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jcdm.main.da.opcuaconfig.domain.DaOpcuaConfig; import java.util.List; @@ -10,7 +11,7 @@ * @author yyt * @date 2024-01-23 */ -public interface DaOpcuaConfigMapper +public interface DaOpcuaConfigMapper extends BaseMapper<DaOpcuaConfig> { /** * 鏌ヨ浜や簰淇″彿閰嶇疆 diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/service/IDaOpcuaConfigService.java b/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/service/IDaOpcuaConfigService.java index 13fbdfa..b7e9ed0 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/service/IDaOpcuaConfigService.java +++ b/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/service/IDaOpcuaConfigService.java @@ -1,5 +1,6 @@ package com.jcdm.main.da.opcuaconfig.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.jcdm.main.da.opcuaconfig.domain.DaOpcuaConfig; import java.util.List; @@ -10,7 +11,7 @@ * @author yyt * @date 2024-01-23 */ -public interface IDaOpcuaConfigService +public interface IDaOpcuaConfigService extends IService<DaOpcuaConfig> { /** * 鏌ヨ浜や簰淇″彿閰嶇疆 diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/service/impl/DaOpcuaConfigServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/service/impl/DaOpcuaConfigServiceImpl.java index 02e9c42..0807f8e 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/service/impl/DaOpcuaConfigServiceImpl.java +++ b/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/service/impl/DaOpcuaConfigServiceImpl.java @@ -1,5 +1,6 @@ package com.jcdm.main.da.opcuaconfig.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jcdm.main.da.opcuaconfig.domain.DaOpcuaConfig; import com.jcdm.main.da.opcuaconfig.mapper.DaOpcuaConfigMapper; import com.jcdm.main.da.opcuaconfig.service.IDaOpcuaConfigService; @@ -15,7 +16,7 @@ * @date 2024-01-23 */ @Service -public class DaOpcuaConfigServiceImpl implements IDaOpcuaConfigService +public class DaOpcuaConfigServiceImpl extends ServiceImpl<DaOpcuaConfigMapper,DaOpcuaConfig> implements IDaOpcuaConfigService { @Autowired private DaOpcuaConfigMapper daOpcuaConfigMapper; diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/mapper/DaParamCollectionMapper.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/mapper/DaParamCollectionMapper.java index 6503fbe..9b0744f 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/mapper/DaParamCollectionMapper.java +++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/mapper/DaParamCollectionMapper.java @@ -1,5 +1,6 @@ package com.jcdm.main.da.paramCollection.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jcdm.main.da.paramCollection.domain.DaParamCollection; import java.util.List; @@ -10,7 +11,7 @@ * @author yyt * @date 2023-12-13 */ -public interface DaParamCollectionMapper +public interface DaParamCollectionMapper extends BaseMapper<DaParamCollection> { /** * 鏌ヨ璁惧浜у搧杩囩▼鍙傛暟閲囬泦 diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/IDaParamCollectionService.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/IDaParamCollectionService.java index 5d3a333..45e4bba 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/IDaParamCollectionService.java +++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/IDaParamCollectionService.java @@ -1,5 +1,6 @@ package com.jcdm.main.da.paramCollection.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.jcdm.main.da.paramCollection.domain.DaParamCollection; import java.util.List; @@ -10,7 +11,7 @@ * @author yyt * @date 2023-12-13 */ -public interface IDaParamCollectionService +public interface IDaParamCollectionService extends IService<DaParamCollection> { /** * 鏌ヨ璁惧浜у搧杩囩▼鍙傛暟閲囬泦 diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java index 2b00023..35c193d 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java +++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java @@ -1,6 +1,7 @@ package com.jcdm.main.da.paramCollection.service.impl; import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jcdm.common.utils.DateUtils; import com.jcdm.main.bs.formulaChild.domain.BsFormulaChildInfo; import com.jcdm.main.bs.formulaChild.mapper.BsFormulaChildInfoMapper; @@ -26,7 +27,7 @@ * @date 2023-12-13 */ @Service -public class DaParamCollectionServiceImpl implements IDaParamCollectionService +public class DaParamCollectionServiceImpl extends ServiceImpl<DaParamCollectionMapper,DaParamCollection> implements IDaParamCollectionService { @Autowired private DaParamCollectionMapper daParamCollectionMapper; diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/mapper/DaPassingStationCollectionMapper.java b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/mapper/DaPassingStationCollectionMapper.java index e7ef05e..3d52d14 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/mapper/DaPassingStationCollectionMapper.java +++ b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/mapper/DaPassingStationCollectionMapper.java @@ -1,5 +1,6 @@ package com.jcdm.main.da.passingStationCollection.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection; import java.util.List; @@ -10,7 +11,7 @@ * @author yyt * @date 2023-12-12 */ -public interface DaPassingStationCollectionMapper +public interface DaPassingStationCollectionMapper extends BaseMapper<DaPassingStationCollection> { /** * 鏌ヨ浜у搧杩囩珯閲囬泦 diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/IDaPassingStationCollectionService.java b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/IDaPassingStationCollectionService.java index f3cd0ca..9135c20 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/IDaPassingStationCollectionService.java +++ b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/IDaPassingStationCollectionService.java @@ -1,5 +1,6 @@ package com.jcdm.main.da.passingStationCollection.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection; import java.util.List; @@ -10,7 +11,7 @@ * @author yyt * @date 2023-12-12 */ -public interface IDaPassingStationCollectionService +public interface IDaPassingStationCollectionService extends IService<DaPassingStationCollection> { /** * 鏌ヨ浜у搧杩囩珯閲囬泦 diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java index a45c08e..dfaf0fa 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java +++ b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java @@ -1,5 +1,6 @@ package com.jcdm.main.da.passingStationCollection.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jcdm.common.utils.DateUtils; //import com.jcdm.main.bs.orderScheduling.domain.BsOrderScheduling; //import com.jcdm.main.bs.orderScheduling.mapper.BsOrderSchedulingMapper; @@ -24,7 +25,7 @@ * @date 2023-12-12 */ @Service -public class DaPassingStationCollectionServiceImpl implements IDaPassingStationCollectionService +public class DaPassingStationCollectionServiceImpl extends ServiceImpl<DaPassingStationCollectionMapper,DaPassingStationCollection> implements IDaPassingStationCollectionService { @Autowired private DaPassingStationCollectionMapper daPassingStationCollectionMapper; diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/equipmentAlarm/mapper/EmEquipmentAlarmMapper.java b/jcdm-main/src/main/java/com/jcdm/main/em/equipmentAlarm/mapper/EmEquipmentAlarmMapper.java index 56392bf..09e8377 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/em/equipmentAlarm/mapper/EmEquipmentAlarmMapper.java +++ b/jcdm-main/src/main/java/com/jcdm/main/em/equipmentAlarm/mapper/EmEquipmentAlarmMapper.java @@ -1,5 +1,6 @@ package com.jcdm.main.em.equipmentAlarm.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jcdm.main.em.equipmentAlarm.domain.EmEquipmentAlarm; import java.util.List; @@ -10,7 +11,7 @@ * @author ruimin * @date 2023-12-15 */ -public interface EmEquipmentAlarmMapper +public interface EmEquipmentAlarmMapper extends BaseMapper<EmEquipmentAlarm> { /** * 鏌ヨ璁惧鎶ヨ diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/equipmentAlarm/service/IEmEquipmentAlarmService.java b/jcdm-main/src/main/java/com/jcdm/main/em/equipmentAlarm/service/IEmEquipmentAlarmService.java index 817395e..15f9e0e 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/em/equipmentAlarm/service/IEmEquipmentAlarmService.java +++ b/jcdm-main/src/main/java/com/jcdm/main/em/equipmentAlarm/service/IEmEquipmentAlarmService.java @@ -1,5 +1,6 @@ package com.jcdm.main.em.equipmentAlarm.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.jcdm.main.em.equipmentAlarm.domain.EmEquipmentAlarm; import java.util.List; @@ -10,7 +11,7 @@ * @author ruimin * @date 2023-12-15 */ -public interface IEmEquipmentAlarmService +public interface IEmEquipmentAlarmService extends IService<EmEquipmentAlarm> { /** * 鏌ヨ璁惧鎶ヨ diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/equipmentAlarm/service/impl/EmEquipmentAlarmServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/em/equipmentAlarm/service/impl/EmEquipmentAlarmServiceImpl.java index ccfd5fc..d88f604 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/em/equipmentAlarm/service/impl/EmEquipmentAlarmServiceImpl.java +++ b/jcdm-main/src/main/java/com/jcdm/main/em/equipmentAlarm/service/impl/EmEquipmentAlarmServiceImpl.java @@ -2,6 +2,7 @@ import java.util.List; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jcdm.main.em.equipmentAlarm.domain.EmEquipmentAlarm; import com.jcdm.main.em.equipmentAlarm.mapper.EmEquipmentAlarmMapper; import com.jcdm.main.em.equipmentAlarm.service.IEmEquipmentAlarmService; @@ -15,7 +16,7 @@ * @date 2023-12-15 */ @Service -public class EmEquipmentAlarmServiceImpl implements IEmEquipmentAlarmService +public class EmEquipmentAlarmServiceImpl extends ServiceImpl<EmEquipmentAlarmMapper,EmEquipmentAlarm> implements IEmEquipmentAlarmService { @Autowired private EmEquipmentAlarmMapper emEquipmentAlarmMapper; diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/equipmentArchives/mapper/EmEquipmentArchivesMapper.java b/jcdm-main/src/main/java/com/jcdm/main/em/equipmentArchives/mapper/EmEquipmentArchivesMapper.java index 6476cce..cfe5c49 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/em/equipmentArchives/mapper/EmEquipmentArchivesMapper.java +++ b/jcdm-main/src/main/java/com/jcdm/main/em/equipmentArchives/mapper/EmEquipmentArchivesMapper.java @@ -1,6 +1,8 @@ package com.jcdm.main.em.equipmentArchives.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jcdm.main.em.equipmentArchives.domain.EmEquipmentArchives; /** @@ -9,7 +11,7 @@ * @author Yi * @date 2023-12-26 */ -public interface EmEquipmentArchivesMapper +public interface EmEquipmentArchivesMapper extends BaseMapper<EmEquipmentArchives> { /** * 鏌ヨ璁惧妗f diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/equipmentArchives/service/IEmEquipmentArchivesService.java b/jcdm-main/src/main/java/com/jcdm/main/em/equipmentArchives/service/IEmEquipmentArchivesService.java index 03b5340..60348a1 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/em/equipmentArchives/service/IEmEquipmentArchivesService.java +++ b/jcdm-main/src/main/java/com/jcdm/main/em/equipmentArchives/service/IEmEquipmentArchivesService.java @@ -1,6 +1,8 @@ package com.jcdm.main.em.equipmentArchives.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; import com.jcdm.main.em.equipmentArchives.domain.EmEquipmentArchives; /** @@ -9,7 +11,7 @@ * @author Yi * @date 2023-12-26 */ -public interface IEmEquipmentArchivesService +public interface IEmEquipmentArchivesService extends IService<EmEquipmentArchives> { /** * 鏌ヨ璁惧妗f diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/equipmentArchives/service/impl/EmEquipmentArchivesServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/em/equipmentArchives/service/impl/EmEquipmentArchivesServiceImpl.java index 7c8040a..e73601b 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/em/equipmentArchives/service/impl/EmEquipmentArchivesServiceImpl.java +++ b/jcdm-main/src/main/java/com/jcdm/main/em/equipmentArchives/service/impl/EmEquipmentArchivesServiceImpl.java @@ -1,6 +1,8 @@ package com.jcdm.main.em.equipmentArchives.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jcdm.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -15,7 +17,7 @@ * @date 2023-12-26 */ @Service -public class EmEquipmentArchivesServiceImpl implements IEmEquipmentArchivesService +public class EmEquipmentArchivesServiceImpl extends ServiceImpl<EmEquipmentArchivesMapper,EmEquipmentArchives> implements IEmEquipmentArchivesService { @Autowired private EmEquipmentArchivesMapper emEquipmentArchivesMapper; diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/equipmentStatus/mapper/EmEquipmentStatusMapper.java b/jcdm-main/src/main/java/com/jcdm/main/em/equipmentStatus/mapper/EmEquipmentStatusMapper.java index 4431caf..d187c40 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/em/equipmentStatus/mapper/EmEquipmentStatusMapper.java +++ b/jcdm-main/src/main/java/com/jcdm/main/em/equipmentStatus/mapper/EmEquipmentStatusMapper.java @@ -1,6 +1,8 @@ package com.jcdm.main.em.equipmentStatus.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jcdm.main.em.equipmentStatus.domain.EmEquipmentStatus; /** @@ -9,7 +11,7 @@ * @author ruimin * @date 2023-12-27 */ -public interface EmEquipmentStatusMapper +public interface EmEquipmentStatusMapper extends BaseMapper<EmEquipmentStatus> { /** * 鏌ヨ璁惧鐘舵�� diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/equipmentStatus/service/IEmEquipmentStatusService.java b/jcdm-main/src/main/java/com/jcdm/main/em/equipmentStatus/service/IEmEquipmentStatusService.java index a93b2ba..f55e547 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/em/equipmentStatus/service/IEmEquipmentStatusService.java +++ b/jcdm-main/src/main/java/com/jcdm/main/em/equipmentStatus/service/IEmEquipmentStatusService.java @@ -1,6 +1,8 @@ package com.jcdm.main.em.equipmentStatus.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; import com.jcdm.main.em.equipmentStatus.domain.EmEquipmentStatus; /** @@ -9,7 +11,7 @@ * @author ruimin * @date 2023-12-27 */ -public interface IEmEquipmentStatusService +public interface IEmEquipmentStatusService extends IService<EmEquipmentStatus> { /** * 鏌ヨ璁惧鐘舵�� diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/equipmentStatus/service/impl/EmEquipmentStatusServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/em/equipmentStatus/service/impl/EmEquipmentStatusServiceImpl.java index 1e0334f..49b0341 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/em/equipmentStatus/service/impl/EmEquipmentStatusServiceImpl.java +++ b/jcdm-main/src/main/java/com/jcdm/main/em/equipmentStatus/service/impl/EmEquipmentStatusServiceImpl.java @@ -1,6 +1,8 @@ package com.jcdm.main.em.equipmentStatus.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jcdm.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -15,7 +17,7 @@ * @date 2023-12-27 */ @Service -public class EmEquipmentStatusServiceImpl implements IEmEquipmentStatusService +public class EmEquipmentStatusServiceImpl extends ServiceImpl<EmEquipmentStatusMapper,EmEquipmentStatus> implements IEmEquipmentStatusService { @Autowired private EmEquipmentStatusMapper emEquipmentStatusMapper; diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionItems/mapper/EmInspectionItemsMapper.java b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionItems/mapper/EmInspectionItemsMapper.java index c989e8c..154b2c0 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionItems/mapper/EmInspectionItemsMapper.java +++ b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionItems/mapper/EmInspectionItemsMapper.java @@ -1,6 +1,8 @@ package com.jcdm.main.em.inspectionItems.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jcdm.main.em.inspectionItems.domain.EmInspectionItems; /** @@ -9,7 +11,7 @@ * @author Yi * @date 2024-03-08 */ -public interface EmInspectionItemsMapper +public interface EmInspectionItemsMapper extends BaseMapper<EmInspectionItems> { /** * 鏌ヨ鐐规淇濆吇椤圭洰 diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionItems/service/IEmInspectionItemsService.java b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionItems/service/IEmInspectionItemsService.java index 3cb1152..16648da 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionItems/service/IEmInspectionItemsService.java +++ b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionItems/service/IEmInspectionItemsService.java @@ -1,6 +1,8 @@ package com.jcdm.main.em.inspectionItems.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; import com.jcdm.main.em.inspectionItems.domain.EmInspectionItems; /** @@ -9,7 +11,7 @@ * @author Yi * @date 2024-03-08 */ -public interface IEmInspectionItemsService +public interface IEmInspectionItemsService extends IService<EmInspectionItems> { /** * 鏌ヨ鐐规淇濆吇椤圭洰 diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionItems/service/impl/EmInspectionItemsServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionItems/service/impl/EmInspectionItemsServiceImpl.java index a112240..c571279 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionItems/service/impl/EmInspectionItemsServiceImpl.java +++ b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionItems/service/impl/EmInspectionItemsServiceImpl.java @@ -1,6 +1,8 @@ package com.jcdm.main.em.inspectionItems.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jcdm.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -15,7 +17,7 @@ * @date 2024-03-08 */ @Service -public class EmInspectionItemsServiceImpl implements IEmInspectionItemsService +public class EmInspectionItemsServiceImpl extends ServiceImpl<EmInspectionItemsMapper,EmInspectionItems> implements IEmInspectionItemsService { @Autowired private EmInspectionItemsMapper emInspectionItemsMapper; diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlan/mapper/EmInspectionPlanMapper.java b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlan/mapper/EmInspectionPlanMapper.java index 3651c39..73d342b 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlan/mapper/EmInspectionPlanMapper.java +++ b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlan/mapper/EmInspectionPlanMapper.java @@ -1,6 +1,9 @@ package com.jcdm.main.em.inspectionPlan.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jcdm.main.em.inspectionItems.domain.EmInspectionItems; import com.jcdm.main.em.inspectionPlan.domain.EmInspectionPlan; /** @@ -9,7 +12,7 @@ * @author Yi * @date 2024-03-08 */ -public interface EmInspectionPlanMapper +public interface EmInspectionPlanMapper extends BaseMapper<EmInspectionPlan> { /** * 鏌ヨ鐐规淇濆吇璁″垝 diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlan/service/IEmInspectionPlanService.java b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlan/service/IEmInspectionPlanService.java index 7695bc7..ed7f351 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlan/service/IEmInspectionPlanService.java +++ b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlan/service/IEmInspectionPlanService.java @@ -1,6 +1,9 @@ package com.jcdm.main.em.inspectionPlan.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.jcdm.main.em.inspectionItems.domain.EmInspectionItems; import com.jcdm.main.em.inspectionPlan.domain.EmInspectionPlan; /** @@ -9,7 +12,7 @@ * @author Yi * @date 2024-03-08 */ -public interface IEmInspectionPlanService +public interface IEmInspectionPlanService extends IService<EmInspectionPlan> { /** * 鏌ヨ鐐规淇濆吇璁″垝 diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlan/service/impl/EmInspectionPlanServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlan/service/impl/EmInspectionPlanServiceImpl.java index c5c0cea..c697ebd 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlan/service/impl/EmInspectionPlanServiceImpl.java +++ b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlan/service/impl/EmInspectionPlanServiceImpl.java @@ -1,6 +1,8 @@ package com.jcdm.main.em.inspectionPlan.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jcdm.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -15,7 +17,7 @@ * @date 2024-03-08 */ @Service -public class EmInspectionPlanServiceImpl implements IEmInspectionPlanService +public class EmInspectionPlanServiceImpl extends ServiceImpl<EmInspectionPlanMapper,EmInspectionPlan> implements IEmInspectionPlanService { @Autowired private EmInspectionPlanMapper emInspectionPlanMapper; diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanArchives/mapper/EmInspectionPlanArchivesMapper.java b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanArchives/mapper/EmInspectionPlanArchivesMapper.java index 12da27d..dbef401 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanArchives/mapper/EmInspectionPlanArchivesMapper.java +++ b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanArchives/mapper/EmInspectionPlanArchivesMapper.java @@ -1,6 +1,8 @@ package com.jcdm.main.em.inspectionPlanArchives.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jcdm.main.em.inspectionPlanArchives.domain.EmInspectionPlanArchives; /** @@ -9,7 +11,7 @@ * @author Yi * @date 2024-03-14 */ -public interface EmInspectionPlanArchivesMapper +public interface EmInspectionPlanArchivesMapper extends BaseMapper<EmInspectionPlanArchives> { /** * 鏌ヨ鐐规淇濆吇璁″垝璁惧娓呭崟 diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanArchives/service/IEmInspectionPlanArchivesService.java b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanArchives/service/IEmInspectionPlanArchivesService.java index ae8cb59..b67cb15 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanArchives/service/IEmInspectionPlanArchivesService.java +++ b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanArchives/service/IEmInspectionPlanArchivesService.java @@ -1,6 +1,8 @@ package com.jcdm.main.em.inspectionPlanArchives.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; import com.jcdm.main.em.inspectionPlanArchives.domain.EmInspectionPlanArchives; /** @@ -9,7 +11,7 @@ * @author Yi * @date 2024-03-14 */ -public interface IEmInspectionPlanArchivesService +public interface IEmInspectionPlanArchivesService extends IService<EmInspectionPlanArchives> { /** * 鏌ヨ鐐规淇濆吇璁″垝璁惧娓呭崟 diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanArchives/service/impl/EmInspectionPlanArchivesServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanArchives/service/impl/EmInspectionPlanArchivesServiceImpl.java index 5f87947..68ebfea 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanArchives/service/impl/EmInspectionPlanArchivesServiceImpl.java +++ b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanArchives/service/impl/EmInspectionPlanArchivesServiceImpl.java @@ -1,6 +1,8 @@ package com.jcdm.main.em.inspectionPlanArchives.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jcdm.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -15,7 +17,7 @@ * @date 2024-03-14 */ @Service -public class EmInspectionPlanArchivesServiceImpl implements IEmInspectionPlanArchivesService +public class EmInspectionPlanArchivesServiceImpl extends ServiceImpl<EmInspectionPlanArchivesMapper,EmInspectionPlanArchives> implements IEmInspectionPlanArchivesService { @Autowired private EmInspectionPlanArchivesMapper emInspectionPlanArchivesMapper; diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanInfo/mapper/EmInspectionPlanInfoMapper.java b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanInfo/mapper/EmInspectionPlanInfoMapper.java index e8abc9e..b835950 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanInfo/mapper/EmInspectionPlanInfoMapper.java +++ b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanInfo/mapper/EmInspectionPlanInfoMapper.java @@ -1,6 +1,8 @@ package com.jcdm.main.em.inspectionPlanInfo.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jcdm.main.em.inspectionPlanInfo.domain.EmInspectionPlanInfo; /** @@ -9,7 +11,7 @@ * @author Yi * @date 2024-03-19 */ -public interface EmInspectionPlanInfoMapper +public interface EmInspectionPlanInfoMapper extends BaseMapper<EmInspectionPlanInfo> { /** * 鏌ヨ璁惧鐐规淇濆吇璁″垝 diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanInfo/service/IEmInspectionPlanInfoService.java b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanInfo/service/IEmInspectionPlanInfoService.java index 73a544f..c6bf474 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanInfo/service/IEmInspectionPlanInfoService.java +++ b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanInfo/service/IEmInspectionPlanInfoService.java @@ -1,6 +1,8 @@ package com.jcdm.main.em.inspectionPlanInfo.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; import com.jcdm.main.em.inspectionPlanInfo.domain.EmInspectionPlanInfo; /** @@ -9,7 +11,7 @@ * @author Yi * @date 2024-03-19 */ -public interface IEmInspectionPlanInfoService +public interface IEmInspectionPlanInfoService extends IService<EmInspectionPlanInfo> { /** * 鏌ヨ璁惧鐐规淇濆吇璁″垝 diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanInfo/service/impl/EmInspectionPlanInfoServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanInfo/service/impl/EmInspectionPlanInfoServiceImpl.java index 881d73f..66a06fe 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanInfo/service/impl/EmInspectionPlanInfoServiceImpl.java +++ b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanInfo/service/impl/EmInspectionPlanInfoServiceImpl.java @@ -1,6 +1,8 @@ package com.jcdm.main.em.inspectionPlanInfo.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jcdm.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -15,7 +17,7 @@ * @date 2024-03-19 */ @Service -public class EmInspectionPlanInfoServiceImpl implements IEmInspectionPlanInfoService +public class EmInspectionPlanInfoServiceImpl extends ServiceImpl<EmInspectionPlanInfoMapper,EmInspectionPlanInfo> implements IEmInspectionPlanInfoService { @Autowired private EmInspectionPlanInfoMapper emInspectionPlanInfoMapper; diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItems/mapper/EmInspectionPlanItemsMapper.java b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItems/mapper/EmInspectionPlanItemsMapper.java index 0d90d7d..1000b82 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItems/mapper/EmInspectionPlanItemsMapper.java +++ b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItems/mapper/EmInspectionPlanItemsMapper.java @@ -1,6 +1,8 @@ package com.jcdm.main.em.inspectionPlanItems.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jcdm.main.em.inspectionPlanItems.domain.EmInspectionPlanItems; /** @@ -9,7 +11,7 @@ * @author Yi * @date 2024-03-13 */ -public interface EmInspectionPlanItemsMapper +public interface EmInspectionPlanItemsMapper extends BaseMapper<EmInspectionPlanItems> { /** * 鏌ヨ鐐规淇濆吇璁″垝鐐规椤圭洰瀛� diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItems/service/IEmInspectionPlanItemsService.java b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItems/service/IEmInspectionPlanItemsService.java index e3d52c2..8800b53 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItems/service/IEmInspectionPlanItemsService.java +++ b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItems/service/IEmInspectionPlanItemsService.java @@ -1,6 +1,8 @@ package com.jcdm.main.em.inspectionPlanItems.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; import com.jcdm.main.em.inspectionPlanItems.domain.EmInspectionPlanItems; /** @@ -9,7 +11,7 @@ * @author Yi * @date 2024-03-13 */ -public interface IEmInspectionPlanItemsService +public interface IEmInspectionPlanItemsService extends IService<EmInspectionPlanItems> { /** * 鏌ヨ鐐规淇濆吇璁″垝鐐规椤圭洰瀛� diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItems/service/impl/EmInspectionPlanItemsServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItems/service/impl/EmInspectionPlanItemsServiceImpl.java index 5e77f51..1abe53a 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItems/service/impl/EmInspectionPlanItemsServiceImpl.java +++ b/jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItems/service/impl/EmInspectionPlanItemsServiceImpl.java @@ -1,6 +1,8 @@ package com.jcdm.main.em.inspectionPlanItems.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jcdm.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -15,7 +17,7 @@ * @date 2024-03-13 */ @Service -public class EmInspectionPlanItemsServiceImpl implements IEmInspectionPlanItemsService +public class EmInspectionPlanItemsServiceImpl extends ServiceImpl<EmInspectionPlanItemsMapper,EmInspectionPlanItems> implements IEmInspectionPlanItemsService { @Autowired private EmInspectionPlanItemsMapper emInspectionPlanItemsMapper; diff --git a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java index 63a195d..fb467e3 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java +++ b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java @@ -2,6 +2,8 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jcdm.main.om.productionOrde.domain.OmProductionOrdeInfo; import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService; import org.springframework.security.access.prepost.PreAuthorize; @@ -42,6 +44,7 @@ public TableDataInfo list(OmProductionOrdeInfo omProductionOrdeInfo) { startPage(); +// List<OmProductionOrdeInfo> list = omProductionOrdeInfoService.list(new LambdaQueryWrapper<OmProductionOrdeInfo>().eq(OmProductionOrdeInfo::getWorkOrderNo, "W_202403120001")); List<OmProductionOrdeInfo> list = omProductionOrdeInfoService.selectOmProductionOrdeInfoList(omProductionOrdeInfo); return getDataTable(list); } diff --git a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java index d434285..d8d7fd8 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java +++ b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java @@ -1,6 +1,8 @@ package com.jcdm.main.om.productionOrde.domain; import java.util.Date; + +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -108,6 +110,7 @@ /** 涓婄嚎瀹屽伐鏍囪 */ private String onlineCompletionMark; + @TableField(exist = false) private Long frontEndId; /** 闇�姹傛棩鏈� */ @@ -183,8 +186,10 @@ /** 棰勭暀瀛楁4 */ private String spareField4; + @TableField(exist = false) private Long[] idNums; + @TableField(exist = false) private String flag; public String getProductModel() { diff --git a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/mapper/OmProductionOrdeInfoMapper.java b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/mapper/OmProductionOrdeInfoMapper.java index fcecab3..f5e07cb 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/mapper/OmProductionOrdeInfoMapper.java +++ b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/mapper/OmProductionOrdeInfoMapper.java @@ -1,5 +1,6 @@ package com.jcdm.main.om.productionOrde.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jcdm.main.om.productionOrde.domain.OmProductionOrdeInfo; import java.util.List; @@ -10,7 +11,7 @@ * @author ruimin * @date 2023-12-11 */ -public interface OmProductionOrdeInfoMapper +public interface OmProductionOrdeInfoMapper extends BaseMapper<OmProductionOrdeInfo> { /** * 鏌ヨ鐢熶骇宸ュ崟 diff --git a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/service/IOmProductionOrdeInfoService.java b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/service/IOmProductionOrdeInfoService.java index 8f5ce40..4b058fb 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/service/IOmProductionOrdeInfoService.java +++ b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/service/IOmProductionOrdeInfoService.java @@ -1,5 +1,6 @@ package com.jcdm.main.om.productionOrde.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.jcdm.common.core.domain.AjaxResult; import com.jcdm.main.om.productionOrde.domain.OmProductionOrdeInfo; @@ -11,7 +12,7 @@ * @author ruimin * @date 2023-12-11 */ -public interface IOmProductionOrdeInfoService +public interface IOmProductionOrdeInfoService extends IService<OmProductionOrdeInfo> { /** * 鏌ヨ鐢熶骇宸ュ崟 diff --git a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/service/impl/OmProductionOrdeInfoServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/service/impl/OmProductionOrdeInfoServiceImpl.java index d7e1aeb..31601d7 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/service/impl/OmProductionOrdeInfoServiceImpl.java +++ b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/service/impl/OmProductionOrdeInfoServiceImpl.java @@ -3,6 +3,7 @@ import java.util.List; import java.util.stream.Collectors; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jcdm.common.core.domain.AjaxResult; import com.jcdm.common.utils.DateUtils; import com.jcdm.main.om.productionOrde.domain.OmProductionOrdeInfo; @@ -18,7 +19,7 @@ * @date 2023-12-11 */ @Service -public class OmProductionOrdeInfoServiceImpl implements IOmProductionOrdeInfoService +public class OmProductionOrdeInfoServiceImpl extends ServiceImpl<OmProductionOrdeInfoMapper,OmProductionOrdeInfo> implements IOmProductionOrdeInfoService { @Autowired private OmProductionOrdeInfoMapper omProductionOrdeInfoMapper; diff --git a/jcdm-main/src/main/java/com/jcdm/main/om/workReport/mapper/OmWorkReportMapper.java b/jcdm-main/src/main/java/com/jcdm/main/om/workReport/mapper/OmWorkReportMapper.java index 210b189..51f3430 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/om/workReport/mapper/OmWorkReportMapper.java +++ b/jcdm-main/src/main/java/com/jcdm/main/om/workReport/mapper/OmWorkReportMapper.java @@ -1,6 +1,8 @@ package com.jcdm.main.om.workReport.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jcdm.main.om.workReport.domain.OmWorkReport; /** @@ -9,7 +11,7 @@ * @author Yi * @date 2023-12-12 */ -public interface OmWorkReportMapper +public interface OmWorkReportMapper extends BaseMapper<OmWorkReport> { /** * 鏌ヨ鎶ュ伐璁板綍 琛� diff --git a/jcdm-main/src/main/java/com/jcdm/main/om/workReport/service/IOmWorkReportService.java b/jcdm-main/src/main/java/com/jcdm/main/om/workReport/service/IOmWorkReportService.java index 3b0e18a..6ea99a7 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/om/workReport/service/IOmWorkReportService.java +++ b/jcdm-main/src/main/java/com/jcdm/main/om/workReport/service/IOmWorkReportService.java @@ -1,6 +1,8 @@ package com.jcdm.main.om.workReport.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; import com.jcdm.main.om.workReport.domain.OmWorkReport; /** @@ -9,7 +11,7 @@ * @author Yi * @date 2023-12-12 */ -public interface IOmWorkReportService +public interface IOmWorkReportService extends IService<OmWorkReport> { /** * 鏌ヨ鎶ュ伐璁板綍 琛� diff --git a/jcdm-main/src/main/java/com/jcdm/main/om/workReport/service/impl/OmWorkReportServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/om/workReport/service/impl/OmWorkReportServiceImpl.java index 8155095..ef01850 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/om/workReport/service/impl/OmWorkReportServiceImpl.java +++ b/jcdm-main/src/main/java/com/jcdm/main/om/workReport/service/impl/OmWorkReportServiceImpl.java @@ -1,6 +1,8 @@ package com.jcdm.main.om.workReport.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jcdm.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -15,7 +17,7 @@ * @date 2023-12-12 */ @Service -public class OmWorkReportServiceImpl implements IOmWorkReportService +public class OmWorkReportServiceImpl extends ServiceImpl<OmWorkReportMapper,OmWorkReport> implements IOmWorkReportService { @Autowired private OmWorkReportMapper omWorkReportMapper; diff --git a/jcdm-main/src/main/java/com/jcdm/main/rm/repairData/mapper/RmRepairDataMapper.java b/jcdm-main/src/main/java/com/jcdm/main/rm/repairData/mapper/RmRepairDataMapper.java index d288f89..82dda2e 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/rm/repairData/mapper/RmRepairDataMapper.java +++ b/jcdm-main/src/main/java/com/jcdm/main/rm/repairData/mapper/RmRepairDataMapper.java @@ -1,6 +1,8 @@ package com.jcdm.main.rm.repairData.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jcdm.main.rm.repairData.domain.RmRepairData; /** @@ -9,7 +11,7 @@ * @author Yi * @date 2023-12-22 */ -public interface RmRepairDataMapper +public interface RmRepairDataMapper extends BaseMapper<RmRepairData> { /** * 鏌ヨ杩斾慨鏁版嵁 diff --git a/jcdm-main/src/main/java/com/jcdm/main/rm/repairData/service/IRmRepairDataService.java b/jcdm-main/src/main/java/com/jcdm/main/rm/repairData/service/IRmRepairDataService.java index c758711..fedf2be 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/rm/repairData/service/IRmRepairDataService.java +++ b/jcdm-main/src/main/java/com/jcdm/main/rm/repairData/service/IRmRepairDataService.java @@ -1,6 +1,8 @@ package com.jcdm.main.rm.repairData.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; import com.jcdm.main.rm.repairData.domain.RmRepairData; /** @@ -9,7 +11,7 @@ * @author Yi * @date 2023-12-22 */ -public interface IRmRepairDataService +public interface IRmRepairDataService extends IService<RmRepairData> { /** * 鏌ヨ杩斾慨鏁版嵁 diff --git a/jcdm-main/src/main/java/com/jcdm/main/rm/repairData/service/impl/RmRepairDataServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/rm/repairData/service/impl/RmRepairDataServiceImpl.java index 92f32d7..3a2df1b 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/rm/repairData/service/impl/RmRepairDataServiceImpl.java +++ b/jcdm-main/src/main/java/com/jcdm/main/rm/repairData/service/impl/RmRepairDataServiceImpl.java @@ -1,6 +1,8 @@ package com.jcdm.main.rm.repairData.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jcdm.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -15,7 +17,7 @@ * @date 2023-12-22 */ @Service -public class RmRepairDataServiceImpl implements IRmRepairDataService +public class RmRepairDataServiceImpl extends ServiceImpl<RmRepairDataMapper,RmRepairData> implements IRmRepairDataService { @Autowired private RmRepairDataMapper rmRepairDataMapper; diff --git a/jcdm-main/src/main/java/com/jcdm/main/rm/repairRecord/mapper/RmRepairRecordMapper.java b/jcdm-main/src/main/java/com/jcdm/main/rm/repairRecord/mapper/RmRepairRecordMapper.java index 69e6019..72d088d 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/rm/repairRecord/mapper/RmRepairRecordMapper.java +++ b/jcdm-main/src/main/java/com/jcdm/main/rm/repairRecord/mapper/RmRepairRecordMapper.java @@ -1,6 +1,8 @@ package com.jcdm.main.rm.repairRecord.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jcdm.main.rm.repairRecord.domain.RmRepairRecord; /** @@ -9,7 +11,7 @@ * @author Yi * @date 2023-12-22 */ -public interface RmRepairRecordMapper +public interface RmRepairRecordMapper extends BaseMapper<RmRepairRecord> { /** * 鏌ヨ杩斾慨璁板綍 diff --git a/jcdm-main/src/main/java/com/jcdm/main/rm/repairRecord/service/IRmRepairRecordService.java b/jcdm-main/src/main/java/com/jcdm/main/rm/repairRecord/service/IRmRepairRecordService.java index ef0b797..4f1ec02 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/rm/repairRecord/service/IRmRepairRecordService.java +++ b/jcdm-main/src/main/java/com/jcdm/main/rm/repairRecord/service/IRmRepairRecordService.java @@ -1,6 +1,8 @@ package com.jcdm.main.rm.repairRecord.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; import com.jcdm.main.rm.repairRecord.domain.RmRepairRecord; /** @@ -9,7 +11,7 @@ * @author Yi * @date 2023-12-22 */ -public interface IRmRepairRecordService +public interface IRmRepairRecordService extends IService<RmRepairRecord> { /** * 鏌ヨ杩斾慨璁板綍 diff --git a/jcdm-main/src/main/java/com/jcdm/main/rm/repairRecord/service/impl/RmRepairRecordServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/rm/repairRecord/service/impl/RmRepairRecordServiceImpl.java index 55c2979..ae06594 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/rm/repairRecord/service/impl/RmRepairRecordServiceImpl.java +++ b/jcdm-main/src/main/java/com/jcdm/main/rm/repairRecord/service/impl/RmRepairRecordServiceImpl.java @@ -1,12 +1,15 @@ package com.jcdm.main.rm.repairRecord.service.impl; -import java.util.List; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jcdm.common.utils.DateUtils; +import com.jcdm.main.rm.repairRecord.domain.RmRepairRecord; +import com.jcdm.main.rm.repairRecord.mapper.RmRepairRecordMapper; +import com.jcdm.main.rm.repairRecord.service.IRmRepairRecordService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.jcdm.main.rm.repairRecord.mapper.RmRepairRecordMapper; -import com.jcdm.main.rm.repairRecord.domain.RmRepairRecord; -import com.jcdm.main.rm.repairRecord.service.IRmRepairRecordService; + +import java.util.List; /** * 杩斾慨璁板綍Service涓氬姟灞傚鐞� @@ -15,7 +18,7 @@ * @date 2023-12-22 */ @Service -public class RmRepairRecordServiceImpl implements IRmRepairRecordService +public class RmRepairRecordServiceImpl extends ServiceImpl<RmRepairRecordMapper,RmRepairRecord> implements IRmRepairRecordService { @Autowired private RmRepairRecordMapper rmRepairRecordMapper; diff --git a/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/mapper/ScStationConfMapper.java b/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/mapper/ScStationConfMapper.java index 1945691..3d1610c 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/mapper/ScStationConfMapper.java +++ b/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/mapper/ScStationConfMapper.java @@ -1,6 +1,8 @@ package com.jcdm.main.sc.stationConf.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jcdm.main.sc.stationConf.domain.ScStationConf; /** @@ -9,7 +11,7 @@ * @author Yi * @date 2024-01-06 */ -public interface ScStationConfMapper +public interface ScStationConfMapper extends BaseMapper<ScStationConf> { /** * 鏌ヨ宸ヤ綅缁堢閰嶇疆 diff --git a/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/service/IScStationConfService.java b/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/service/IScStationConfService.java index e3daefd..01e0ab6 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/service/IScStationConfService.java +++ b/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/service/IScStationConfService.java @@ -1,6 +1,8 @@ package com.jcdm.main.sc.stationConf.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; import com.jcdm.main.sc.stationConf.domain.ScStationConf; /** @@ -9,7 +11,7 @@ * @author Yi * @date 2024-01-06 */ -public interface IScStationConfService +public interface IScStationConfService extends IService<ScStationConf> { /** * 鏌ヨ宸ヤ綅缁堢閰嶇疆 diff --git a/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/service/impl/ScStationConfServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/service/impl/ScStationConfServiceImpl.java index c269781..55202da 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/service/impl/ScStationConfServiceImpl.java +++ b/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/service/impl/ScStationConfServiceImpl.java @@ -2,6 +2,8 @@ import java.net.InetAddress; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jcdm.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -16,7 +18,7 @@ * @date 2024-01-06 */ @Service -public class ScStationConfServiceImpl implements IScStationConfService +public class ScStationConfServiceImpl extends ServiceImpl<ScStationConfMapper,ScStationConf> implements IScStationConfService { @Autowired private ScStationConfMapper scStationConfMapper; -- Gitblit v1.9.3