diff --git a/dq-financial-api/src/main/java/com/daqing/financial/config/SwaggerConfig.java b/dq-financial-api/src/main/java/com/daqing/financial/config/SwaggerConfig.java index 361ec2ae..eb8759e3 100644 --- a/dq-financial-api/src/main/java/com/daqing/financial/config/SwaggerConfig.java +++ b/dq-financial-api/src/main/java/com/daqing/financial/config/SwaggerConfig.java @@ -37,5 +37,4 @@ public class SwaggerConfig { return new ApiInfoBuilder().title("大庆智慧金融平台api文档").description("大庆智慧金融平台api文档") .version("1.0").build(); } - } \ No newline at end of file diff --git a/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerControllerApi.java b/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerControllerApi.java index 6edc92d8..43b02b5a 100644 --- a/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerControllerApi.java +++ b/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerControllerApi.java @@ -1,15 +1,12 @@ package com.daqing.financial.crms; -import com.daqing.framework.domain.crms.CustomerEntity; -import com.daqing.framework.domain.crms.PersonalCustomerEntity; + import com.daqing.framework.domain.crms.ext.CustomerCompanyTO; import com.daqing.framework.domain.crms.ext.CustomerPersonalTO; import com.daqing.framework.domain.crms.request.CustomerRequest; import com.daqing.framework.model.response.ResponseResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; import java.util.List; import java.util.Map; @@ -58,4 +55,10 @@ public interface CustomerControllerApi { */ @ApiOperation(value = "更新个人类型客户信息", notes = "更新个人类型客户信息") ResponseResult updatePersonal(CustomerPersonalTO customerPersonalTO); + + /** + * 更新企业类型客户信息 + */ + @ApiOperation(value = "更新企业类型客户信息", notes = "更新企业类型客户信息") + ResponseResult updateCompany(CustomerCompanyTO customerCompanyTO); } diff --git a/dq-financial-api/target/classes/com/daqing/financial/config/SwaggerConfig.class b/dq-financial-api/target/classes/com/daqing/financial/config/SwaggerConfig.class new file mode 100644 index 00000000..a7514701 Binary files /dev/null and b/dq-financial-api/target/classes/com/daqing/financial/config/SwaggerConfig.class differ diff --git a/dq-financial-api/target/classes/com/daqing/financial/crms/CustomerControllerApi.class b/dq-financial-api/target/classes/com/daqing/financial/crms/CustomerControllerApi.class new file mode 100644 index 00000000..d5176bda Binary files /dev/null and b/dq-financial-api/target/classes/com/daqing/financial/crms/CustomerControllerApi.class differ diff --git a/dq-financial-api/target/classes/com/daqing/financial/hrms/DeptControllerApi.class b/dq-financial-api/target/classes/com/daqing/financial/hrms/DeptControllerApi.class new file mode 100644 index 00000000..a5d1899a Binary files /dev/null and b/dq-financial-api/target/classes/com/daqing/financial/hrms/DeptControllerApi.class differ diff --git a/dq-financial-api/target/classes/com/daqing/financial/hrms/EmployeeControllerApi.class b/dq-financial-api/target/classes/com/daqing/financial/hrms/EmployeeControllerApi.class new file mode 100644 index 00000000..67eb51e8 Binary files /dev/null and b/dq-financial-api/target/classes/com/daqing/financial/hrms/EmployeeControllerApi.class differ diff --git a/dq-financial-api/target/classes/com/daqing/financial/hrms/PermissionControllerApi.class b/dq-financial-api/target/classes/com/daqing/financial/hrms/PermissionControllerApi.class new file mode 100644 index 00000000..2d3241db Binary files /dev/null and b/dq-financial-api/target/classes/com/daqing/financial/hrms/PermissionControllerApi.class differ diff --git a/dq-financial-api/target/classes/com/daqing/financial/hrms/PositionControllerApi.class b/dq-financial-api/target/classes/com/daqing/financial/hrms/PositionControllerApi.class new file mode 100644 index 00000000..5ebd725f Binary files /dev/null and b/dq-financial-api/target/classes/com/daqing/financial/hrms/PositionControllerApi.class differ diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java index da6cceb4..0cf65025 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java @@ -97,4 +97,14 @@ public class CustomerController implements CustomerControllerApi { boolean result = customerService.updateCustomerPersonal(customerPersonalTO.getCustomerEntity(), customerPersonalTO.getPersonalCustomerEntity()); return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL(); } + + /** + * 更新企业类型客户信息 + */ + @PostMapping("/updateCompany") + @Override + public ResponseResult updateCompany(@RequestBody CustomerCompanyTO customerCompanyTO) { + boolean result = customerService.updateCustomerCompany(customerCompanyTO.getCustomerEntity(), customerCompanyTO.getCompanyCustomerEntity()); + return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL(); + } } diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CompanyCustomerDao.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CompanyCustomerDao.java index 12c13935..c03e0529 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CompanyCustomerDao.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CompanyCustomerDao.java @@ -17,4 +17,7 @@ public interface CompanyCustomerDao extends BaseMapper { CompanyCustomerEntity queryCompanyCustomerById(Long id); boolean saveCompanyCustomer(CompanyCustomerEntity companyCustomerEntity); + + boolean updateCompanyCustomer(CompanyCustomerEntity companyCustomerEntity); + } diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java index a3fe1256..8974471a 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java @@ -32,4 +32,5 @@ public interface CustomerDao extends BaseMapper { boolean saveCustomer(CustomerEntity customerEntity); boolean updateCustomer(CustomerEntity customerEntity); + } diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java index 5c1596e8..bce1f93f 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java @@ -31,5 +31,7 @@ public interface CustomerService extends IService { boolean saveCustomerCompany(CustomerEntity customerEntity, CompanyCustomerEntity companyCustomerEntity); boolean updateCustomerPersonal(CustomerEntity customerEntity, PersonalCustomerEntity personalCustomerEntity); + + boolean updateCustomerCompany(CustomerEntity customerEntity, CompanyCustomerEntity companyCustomerEntity); } diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java index 4cd02430..a263903e 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java @@ -180,6 +180,7 @@ public class CustomerServiceImpl extends ServiceImpl + + + UPDATE crms_company_customer + SET registered_capital=#{registeredCapital},industry=#{industry},years=#{years},region=#{region},shareholder=#{shareholder}, + affiliated_company=#{affiliatedCompany},emp_num=#{empNum},linkman=#{linkman},business_source=#{businessSource} + WHERE customer_id = #{customerId} + + \ No newline at end of file diff --git a/dq-financial-crms/src/main/resources/mapper/crms/PersonalCustomerDao.xml b/dq-financial-crms/src/main/resources/mapper/crms/PersonalCustomerDao.xml index 01258b7e..f6812751 100644 --- a/dq-financial-crms/src/main/resources/mapper/crms/PersonalCustomerDao.xml +++ b/dq-financial-crms/src/main/resources/mapper/crms/PersonalCustomerDao.xml @@ -51,7 +51,7 @@ living_situation=#{livingSituation},residence_addr=#{residenceAddr},business_source=#{businessSource}, emergency_linkman=#{emergencyLinkman},emergency_linkman_relationship=#{emergencyLinkmanRelationship}, emergency_linkman_phone=#{emergencyLinkmanPhone} - WHERE customer_id = #{customer_id} + WHERE customer_id = #{customerId} \ No newline at end of file diff --git a/dq-financial-crms/target/classes/bootstrap.properties b/dq-financial-crms/target/classes/bootstrap.properties new file mode 100644 index 00000000..95bb071b --- /dev/null +++ b/dq-financial-crms/target/classes/bootstrap.properties @@ -0,0 +1,18 @@ +#服务名称 +spring.application.name=dq-financial-crms +#配置中心地址 +spring.cloud.nacos.config.server-addr=192.168.31.142:8848 +spring.cloud.nacos.config.namespace=1f69d47e-0aeb-4a1e-8ab4-0e84dfb86354 +#spring.cloud.nacos.config.group=prod + +spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml +spring.cloud.nacos.config.ext-config[0].group=dev +spring.cloud.nacos.config.ext-config[0].refresh=true + +spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml +spring.cloud.nacos.config.ext-config[1].group=dev +spring.cloud.nacos.config.ext-config[1].refresh=true + +spring.cloud.nacos.config.ext-config[2].data-id=other.yml +spring.cloud.nacos.config.ext-config[2].group=dev +spring.cloud.nacos.config.ext-config[2].refresh=true \ No newline at end of file diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/DqFinancialCrmsApplication.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/DqFinancialCrmsApplication.class new file mode 100644 index 00000000..518270b3 Binary files /dev/null and b/dq-financial-crms/target/classes/com/daqing/financial/crms/DqFinancialCrmsApplication.class differ diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/config/IPageConfig.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/config/IPageConfig.class new file mode 100644 index 00000000..176a6cff Binary files /dev/null and b/dq-financial-crms/target/classes/com/daqing/financial/crms/config/IPageConfig.class differ diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/controller/CustomerController.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/controller/CustomerController.class new file mode 100644 index 00000000..41bfed1f Binary files /dev/null and b/dq-financial-crms/target/classes/com/daqing/financial/crms/controller/CustomerController.class differ diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/CompanyCustomerDao.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/CompanyCustomerDao.class new file mode 100644 index 00000000..364a01cf Binary files /dev/null and b/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/CompanyCustomerDao.class differ diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/CustomerDao.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/CustomerDao.class new file mode 100644 index 00000000..28a5437a Binary files /dev/null and b/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/CustomerDao.class differ diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/PersonalCustomerDao.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/PersonalCustomerDao.class new file mode 100644 index 00000000..ab7598c4 Binary files /dev/null and b/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/PersonalCustomerDao.class differ diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/feign/HrmsFeignService.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/feign/HrmsFeignService.class new file mode 100644 index 00000000..b1b46d44 Binary files /dev/null and b/dq-financial-crms/target/classes/com/daqing/financial/crms/feign/HrmsFeignService.class differ diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/service/CustomerService.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/service/CustomerService.class new file mode 100644 index 00000000..85a53d93 Binary files /dev/null and b/dq-financial-crms/target/classes/com/daqing/financial/crms/service/CustomerService.class differ diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/service/impl/CustomerServiceImpl.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/service/impl/CustomerServiceImpl.class new file mode 100644 index 00000000..41f26e0d Binary files /dev/null and b/dq-financial-crms/target/classes/com/daqing/financial/crms/service/impl/CustomerServiceImpl.class differ diff --git a/dq-financial-crms/target/classes/logback-spring.xml b/dq-financial-crms/target/classes/logback-spring.xml new file mode 100644 index 00000000..665124da --- /dev/null +++ b/dq-financial-crms/target/classes/logback-spring.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + utf8 + + + + + + + + ${LOG_HOME}/crms.%d{yyyy-MM-dd}.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + 0 + + 512 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dq-financial-crms/target/classes/mapper/crms/CompanyCustomerDao.xml b/dq-financial-crms/target/classes/mapper/crms/CompanyCustomerDao.xml new file mode 100644 index 00000000..46b05a0b --- /dev/null +++ b/dq-financial-crms/target/classes/mapper/crms/CompanyCustomerDao.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO crms_company_customer + (id,registered_capital,industry,years,region,shareholder,affiliated_company,emp_num,linkman,business_source,customer_id) + values (#{id},#{registeredCapital},#{industry},#{years},#{region},#{shareholder},#{affiliatedCompany},#{empNum},#{linkman}, + #{businessSource},#{customerId}); + + + + + UPDATE crms_company_customer + SET registered_capital=#{registeredCapital},industry=#{industry},years=#{years},region=#{region},shareholder=#{shareholder}, + affiliated_company=#{affiliatedCompany},emp_num=#{empNum},linkman=#{linkman},business_source=#{businessSource} + WHERE customer_id = #{customerId} + + + \ No newline at end of file diff --git a/dq-financial-crms/target/classes/mapper/crms/CustomerDao.xml b/dq-financial-crms/target/classes/mapper/crms/CustomerDao.xml new file mode 100644 index 00000000..af1020c3 --- /dev/null +++ b/dq-financial-crms/target/classes/mapper/crms/CustomerDao.xml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + UPDATE crms_customer + SET del_or_not = 1 + WHERE id IN + + #{id} + + + + + + + + + INSERT INTO crms_customer + (id,code,type,manager,name,addr,phone,del_or_not,status,create_time,motify_time) + VALUES (#{id},#{code},#{type},#{manager},#{name},#{addr},#{phone},0,0,#{createTime},#{motifyTime}) + + + + + UPDATE crms_customer + SET manager=#{manager},name=#{name},addr=#{addr},phone=#{phone},motify_time=#{motifyTime} + WHERE id = #{id} + + + \ No newline at end of file diff --git a/dq-financial-crms/target/classes/mapper/crms/PersonalCustomerDao.xml b/dq-financial-crms/target/classes/mapper/crms/PersonalCustomerDao.xml new file mode 100644 index 00000000..f6812751 --- /dev/null +++ b/dq-financial-crms/target/classes/mapper/crms/PersonalCustomerDao.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO crms_personal_customer + (id,customer_id,id_card,age,gender,marital_status,education,employer,position,working_years,social_security_num,living_situation + ,residence_addr,business_source,emergency_linkman,emergency_linkman_relationship,emergency_linkman_phone) + VALUES (#{id},#{customerId},#{idCard},#{age},#{gender},#{maritalStatus},#{education},#{employer},#{position},#{workingYears}, + #{socialSecurityNum},#{livingSituation},#{residenceAddr},#{businessSource},#{emergencyLinkman},#{emergencyLinkmanRelationship}, + #{emergencyLinkmanPhone}); + + + + + UPDATE crms_personal_customer + SET id_card=#{idCard},age=#{age},gender=#{gender},marital_status=#{maritalStatus},education=#{education}, + employer=#{employer},position=#{position},working_years=#{workingYears},social_security_num=#{socialSecurityNum}, + living_situation=#{livingSituation},residence_addr=#{residenceAddr},business_source=#{businessSource}, + emergency_linkman=#{emergencyLinkman},emergency_linkman_relationship=#{emergencyLinkmanRelationship}, + emergency_linkman_phone=#{emergencyLinkmanPhone} + WHERE customer_id = #{customerId} + + + \ No newline at end of file diff --git a/dq-financial-crms/target/test-classes/com/daqing/financial/crms/DqFinancialCrmsApplicationTests.class b/dq-financial-crms/target/test-classes/com/daqing/financial/crms/DqFinancialCrmsApplicationTests.class new file mode 100644 index 00000000..9e78cf07 Binary files /dev/null and b/dq-financial-crms/target/test-classes/com/daqing/financial/crms/DqFinancialCrmsApplicationTests.class differ diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/DeptDao.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/DeptDao.java index 95e8328b..17dc3ff0 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/DeptDao.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/DeptDao.java @@ -21,9 +21,8 @@ public interface DeptDao extends BaseMapper { Integer getEmpDeptCount(@Param("deptId") Long deptId); -<<<<<<< Updated upstream List getByPositionId(@Param("positionId") Long positionId); -======= + List listDepartment(); ->>>>>>> Stashed changes + } diff --git a/dq-financial-hrms/target/classes/bootstrap.properties b/dq-financial-hrms/target/classes/bootstrap.properties new file mode 100644 index 00000000..d1c6bdec --- /dev/null +++ b/dq-financial-hrms/target/classes/bootstrap.properties @@ -0,0 +1,18 @@ +#服务名称 +spring.application.name=dq-financial-hrms +#配置中心地址 +spring.cloud.nacos.config.server-addr=192.168.31.142:8848 +spring.cloud.nacos.config.namespace=4c56c2f9-b6a3-4e7b-88b8-b1001e86dfd6 +#spring.cloud.nacos.config.group=prod + +spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml +spring.cloud.nacos.config.ext-config[0].group=dev +spring.cloud.nacos.config.ext-config[0].refresh=true + +spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml +spring.cloud.nacos.config.ext-config[1].group=dev +spring.cloud.nacos.config.ext-config[1].refresh=true + +spring.cloud.nacos.config.ext-config[2].data-id=other.yml +spring.cloud.nacos.config.ext-config[2].group=dev +spring.cloud.nacos.config.ext-config[2].refresh=true \ No newline at end of file diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/DqFinancialHrmsApplication.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/DqFinancialHrmsApplication.class new file mode 100644 index 00000000..0bbc7ab2 Binary files /dev/null and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/DqFinancialHrmsApplication.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/config/IPageConfig.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/config/IPageConfig.class new file mode 100644 index 00000000..536b9a73 Binary files /dev/null and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/config/IPageConfig.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/DeptController.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/DeptController.class new file mode 100644 index 00000000..038c5072 Binary files /dev/null and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/DeptController.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/EmployeeController.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/EmployeeController.class new file mode 100644 index 00000000..2498d0d1 Binary files /dev/null and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/EmployeeController.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/PermissionController.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/PermissionController.class new file mode 100644 index 00000000..4a403370 Binary files /dev/null and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/PermissionController.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/PositionController.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/PositionController.class new file mode 100644 index 00000000..30a13490 Binary files /dev/null and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/PositionController.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/RoleController.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/RoleController.class new file mode 100644 index 00000000..05ce7586 Binary files /dev/null and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/RoleController.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/UserController.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/UserController.class new file mode 100644 index 00000000..949f0700 Binary files /dev/null and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/UserController.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/DeptDao.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/DeptDao.class new file mode 100644 index 00000000..e4f9f56e Binary files /dev/null and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/DeptDao.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/DeptPositionDao.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/DeptPositionDao.class new file mode 100644 index 00000000..b5df5917 Binary files /dev/null and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/DeptPositionDao.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/EmployeeDao.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/EmployeeDao.class new file mode 100644 index 00000000..212b02a4 Binary files /dev/null and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/EmployeeDao.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/EmployeeDeptDao.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/EmployeeDeptDao.class new file mode 100644 index 00000000..d4c39af6 Binary files /dev/null and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/EmployeeDeptDao.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/EmployeePositionDao.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/EmployeePositionDao.class new file mode 100644 index 00000000..65350f34 Binary files /dev/null and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/EmployeePositionDao.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/EmployeeRoleDao.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/EmployeeRoleDao.class new file mode 100644 index 00000000..3cd6f7ca Binary files /dev/null and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/EmployeeRoleDao.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/PermissionDao.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/PermissionDao.class new file mode 100644 index 00000000..d9ff33f1 Binary files /dev/null and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/PermissionDao.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/PositionDao.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/PositionDao.class new file mode 100644 index 00000000..288728e2 Binary files /dev/null and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/PositionDao.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/RoleDao.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/RoleDao.class new file mode 100644 index 00000000..7df8fd00 Binary files /dev/null and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/RoleDao.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/RolePermissionDao.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/RolePermissionDao.class new file mode 100644 index 00000000..11c28e39 Binary files /dev/null and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/RolePermissionDao.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/UserDao.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/UserDao.class new file mode 100644 index 00000000..f0b5e89b Binary files /dev/null and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/UserDao.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/feign/CrmsFeignService.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/feign/CrmsFeignService.class new file mode 100644 index 00000000..62de0cd2 Binary files /dev/null and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/feign/CrmsFeignService.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/DeptService.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/DeptService.class new file mode 100644 index 00000000..08bd98ce Binary files /dev/null and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/DeptService.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/EmployeeService.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/EmployeeService.class new file mode 100644 index 00000000..f8ea318c Binary files /dev/null and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/EmployeeService.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/PermissionService.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/PermissionService.class new file mode 100644 index 00000000..df6c20b1 Binary files /dev/null and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/PermissionService.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/PositionService.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/PositionService.class new file mode 100644 index 00000000..937a9381 Binary files /dev/null and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/PositionService.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/RoleService.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/RoleService.class new file mode 100644 index 00000000..4860e7a3 Binary files /dev/null and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/RoleService.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/UserService.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/UserService.class new file mode 100644 index 00000000..392ea20a Binary files /dev/null and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/UserService.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/DeptServiceImpl.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/DeptServiceImpl.class new file mode 100644 index 00000000..77de5a98 Binary files /dev/null and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/DeptServiceImpl.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.class new file mode 100644 index 00000000..245eea94 Binary files /dev/null and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/PermissionServiceImpl.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/PermissionServiceImpl.class new file mode 100644 index 00000000..d90071da Binary files /dev/null and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/PermissionServiceImpl.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/PositionServiceImpl.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/PositionServiceImpl.class new file mode 100644 index 00000000..6abba0f5 Binary files /dev/null and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/PositionServiceImpl.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/RoleServiceImpl.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/RoleServiceImpl.class new file mode 100644 index 00000000..652de72c Binary files /dev/null and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/RoleServiceImpl.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/UserServiceImpl.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/UserServiceImpl.class new file mode 100644 index 00000000..9a5c202b Binary files /dev/null and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/UserServiceImpl.class differ diff --git a/dq-financial-hrms/target/classes/logback-spring.xml b/dq-financial-hrms/target/classes/logback-spring.xml new file mode 100644 index 00000000..6ea905d3 --- /dev/null +++ b/dq-financial-hrms/target/classes/logback-spring.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + utf8 + + + + + + + + ${LOG_HOME}/hrms.%d{yyyy-MM-dd}.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + 0 + + 512 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dq-financial-hrms/target/classes/mapper/hrms/DeptDao.xml b/dq-financial-hrms/target/classes/mapper/hrms/DeptDao.xml new file mode 100644 index 00000000..294e0608 --- /dev/null +++ b/dq-financial-hrms/target/classes/mapper/hrms/DeptDao.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dq-financial-hrms/target/classes/mapper/hrms/DeptPositionDao.xml b/dq-financial-hrms/target/classes/mapper/hrms/DeptPositionDao.xml new file mode 100644 index 00000000..c0c2fd6f --- /dev/null +++ b/dq-financial-hrms/target/classes/mapper/hrms/DeptPositionDao.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + INSERT INTO hrms_dept_position (id, dept_id, position_id) + VALUES + + (#{item.id}, #{item.deptId}, #{item.positionId}) + + + + + DELETE + FROM + hrms_dept_position + WHERE + position_id = #{positionId} + + + \ No newline at end of file diff --git a/dq-financial-hrms/target/classes/mapper/hrms/EmployeeDao.xml b/dq-financial-hrms/target/classes/mapper/hrms/EmployeeDao.xml new file mode 100644 index 00000000..ca722c24 --- /dev/null +++ b/dq-financial-hrms/target/classes/mapper/hrms/EmployeeDao.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dq-financial-hrms/target/classes/mapper/hrms/EmployeeDeptDao.xml b/dq-financial-hrms/target/classes/mapper/hrms/EmployeeDeptDao.xml new file mode 100644 index 00000000..5cdf5c39 --- /dev/null +++ b/dq-financial-hrms/target/classes/mapper/hrms/EmployeeDeptDao.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dq-financial-hrms/target/classes/mapper/hrms/EmployeePositionDao.xml b/dq-financial-hrms/target/classes/mapper/hrms/EmployeePositionDao.xml new file mode 100644 index 00000000..e6cc8987 --- /dev/null +++ b/dq-financial-hrms/target/classes/mapper/hrms/EmployeePositionDao.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dq-financial-hrms/target/classes/mapper/hrms/EmployeeRoleDao.xml b/dq-financial-hrms/target/classes/mapper/hrms/EmployeeRoleDao.xml new file mode 100644 index 00000000..7e34662a --- /dev/null +++ b/dq-financial-hrms/target/classes/mapper/hrms/EmployeeRoleDao.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dq-financial-hrms/target/classes/mapper/hrms/PermissionDao.xml b/dq-financial-hrms/target/classes/mapper/hrms/PermissionDao.xml new file mode 100644 index 00000000..9daf7734 --- /dev/null +++ b/dq-financial-hrms/target/classes/mapper/hrms/PermissionDao.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dq-financial-hrms/target/classes/mapper/hrms/PositionDao.xml b/dq-financial-hrms/target/classes/mapper/hrms/PositionDao.xml new file mode 100644 index 00000000..343ac5b5 --- /dev/null +++ b/dq-financial-hrms/target/classes/mapper/hrms/PositionDao.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dq-financial-hrms/target/classes/mapper/hrms/RoleDao.xml b/dq-financial-hrms/target/classes/mapper/hrms/RoleDao.xml new file mode 100644 index 00000000..14d82ba9 --- /dev/null +++ b/dq-financial-hrms/target/classes/mapper/hrms/RoleDao.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dq-financial-hrms/target/classes/mapper/hrms/RolePermissionDao.xml b/dq-financial-hrms/target/classes/mapper/hrms/RolePermissionDao.xml new file mode 100644 index 00000000..0073b5e7 --- /dev/null +++ b/dq-financial-hrms/target/classes/mapper/hrms/RolePermissionDao.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dq-financial-hrms/target/classes/mapper/hrms/UserDao.xml b/dq-financial-hrms/target/classes/mapper/hrms/UserDao.xml new file mode 100644 index 00000000..8885d686 --- /dev/null +++ b/dq-financial-hrms/target/classes/mapper/hrms/UserDao.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dq-financial-hrms/target/test-classes/com/daqing/financial/hrms/DqFinancialHrmsApplicationTests.class b/dq-financial-hrms/target/test-classes/com/daqing/financial/hrms/DqFinancialHrmsApplicationTests.class new file mode 100644 index 00000000..aab19442 Binary files /dev/null and b/dq-financial-hrms/target/test-classes/com/daqing/financial/hrms/DqFinancialHrmsApplicationTests.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/client/DqFinancialList.class b/dq-framework-common/target/classes/com/daqing/framework/client/DqFinancialList.class new file mode 100644 index 00000000..1f3f5a05 Binary files /dev/null and b/dq-framework-common/target/classes/com/daqing/framework/client/DqFinancialList.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/exception/CustomException.class b/dq-framework-common/target/classes/com/daqing/framework/exception/CustomException.class new file mode 100644 index 00000000..5821baa4 Binary files /dev/null and b/dq-framework-common/target/classes/com/daqing/framework/exception/CustomException.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/exception/ExceptionCast.class b/dq-framework-common/target/classes/com/daqing/framework/exception/ExceptionCast.class new file mode 100644 index 00000000..f1116d34 Binary files /dev/null and b/dq-framework-common/target/classes/com/daqing/framework/exception/ExceptionCast.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/exception/ExceptionCatch.class b/dq-framework-common/target/classes/com/daqing/framework/exception/ExceptionCatch.class new file mode 100644 index 00000000..16e314dd Binary files /dev/null and b/dq-framework-common/target/classes/com/daqing/framework/exception/ExceptionCatch.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/model/Constant$CloudService.class b/dq-framework-common/target/classes/com/daqing/framework/model/Constant$CloudService.class new file mode 100644 index 00000000..0c3ad7c6 Binary files /dev/null and b/dq-framework-common/target/classes/com/daqing/framework/model/Constant$CloudService.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/model/Constant$MenuType.class b/dq-framework-common/target/classes/com/daqing/framework/model/Constant$MenuType.class new file mode 100644 index 00000000..a639a2bc Binary files /dev/null and b/dq-framework-common/target/classes/com/daqing/framework/model/Constant$MenuType.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/model/Constant$ScheduleStatus.class b/dq-framework-common/target/classes/com/daqing/framework/model/Constant$ScheduleStatus.class new file mode 100644 index 00000000..67e8483f Binary files /dev/null and b/dq-framework-common/target/classes/com/daqing/framework/model/Constant$ScheduleStatus.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/model/Constant.class b/dq-framework-common/target/classes/com/daqing/framework/model/Constant.class new file mode 100644 index 00000000..79548676 Binary files /dev/null and b/dq-framework-common/target/classes/com/daqing/framework/model/Constant.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/model/request/RequestData.class b/dq-framework-common/target/classes/com/daqing/framework/model/request/RequestData.class new file mode 100644 index 00000000..9df69b0a Binary files /dev/null and b/dq-framework-common/target/classes/com/daqing/framework/model/request/RequestData.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/model/response/CommonCode.class b/dq-framework-common/target/classes/com/daqing/framework/model/response/CommonCode.class new file mode 100644 index 00000000..2f3adc83 Binary files /dev/null and b/dq-framework-common/target/classes/com/daqing/framework/model/response/CommonCode.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/model/response/ResponseResult.class b/dq-framework-common/target/classes/com/daqing/framework/model/response/ResponseResult.class new file mode 100644 index 00000000..2dfdcba6 Binary files /dev/null and b/dq-framework-common/target/classes/com/daqing/framework/model/response/ResponseResult.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/model/response/ResultCode.class b/dq-framework-common/target/classes/com/daqing/framework/model/response/ResultCode.class new file mode 100644 index 00000000..a9527cda Binary files /dev/null and b/dq-framework-common/target/classes/com/daqing/framework/model/response/ResultCode.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/web/BaseController.class b/dq-framework-common/target/classes/com/daqing/framework/web/BaseController.class new file mode 100644 index 00000000..eee676c8 Binary files /dev/null and b/dq-framework-common/target/classes/com/daqing/framework/web/BaseController.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/xss/SQLFilter.class b/dq-framework-common/target/classes/com/daqing/framework/xss/SQLFilter.class new file mode 100644 index 00000000..92132ee5 Binary files /dev/null and b/dq-framework-common/target/classes/com/daqing/framework/xss/SQLFilter.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CompanyCustomerEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CompanyCustomerEntity.class new file mode 100644 index 00000000..f8b09d94 Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CompanyCustomerEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CustomerEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CustomerEntity.class new file mode 100644 index 00000000..23b441cf Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CustomerEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/PersonalCustomerEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/PersonalCustomerEntity.class new file mode 100644 index 00000000..80699e2b Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/PersonalCustomerEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CrmsConstant$CustomerType.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CrmsConstant$CustomerType.class new file mode 100644 index 00000000..526d0e0b Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CrmsConstant$CustomerType.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CrmsConstant.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CrmsConstant.class new file mode 100644 index 00000000..5733c727 Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CrmsConstant.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTO.class new file mode 100644 index 00000000..82f2579a Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTO.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.class new file mode 100644 index 00000000..29e9e50e Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTO.class new file mode 100644 index 00000000..bc81dd6f Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTO.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.class new file mode 100644 index 00000000..1b8d25ef Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerTO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerTO.class new file mode 100644 index 00000000..e9fb7b82 Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerTO.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/request/CustomerRequest.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/request/CustomerRequest.class new file mode 100644 index 00000000..9bdc2d3e Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/request/CustomerRequest.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DepartmentVO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DepartmentVO.class new file mode 100644 index 00000000..6a66e885 Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DepartmentVO.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DeptEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DeptEntity.class new file mode 100644 index 00000000..8306bc71 Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DeptEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DeptPositionEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DeptPositionEntity.class new file mode 100644 index 00000000..a47676ef Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DeptPositionEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeDeptEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeDeptEntity.class new file mode 100644 index 00000000..3e30fb0e Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeDeptEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeEntity.class new file mode 100644 index 00000000..d71b86b3 Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeePositionEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeePositionEntity.class new file mode 100644 index 00000000..d8c65b98 Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeePositionEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeRoleEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeRoleEntity.class new file mode 100644 index 00000000..d5477484 Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeRoleEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/PermissionEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/PermissionEntity.class new file mode 100644 index 00000000..e2fe2c57 Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/PermissionEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/PositionEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/PositionEntity.class new file mode 100644 index 00000000..1ecb5100 Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/PositionEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/RoleEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/RoleEntity.class new file mode 100644 index 00000000..337cf0f5 Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/RoleEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/RolePermissionEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/RolePermissionEntity.class new file mode 100644 index 00000000..774faa19 Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/RolePermissionEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/UserEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/UserEntity.class new file mode 100644 index 00000000..6cb3517d Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/UserEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/EmployeeTO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/EmployeeTO.class new file mode 100644 index 00000000..9c07c003 Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/EmployeeTO.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/EmployeeVO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/EmployeeVO.class new file mode 100644 index 00000000..dd2d9724 Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/EmployeeVO.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/PositionVO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/PositionVO.class new file mode 100644 index 00000000..ab50858c Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/PositionVO.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/DeptAddRequest.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/DeptAddRequest.class new file mode 100644 index 00000000..d72e152c Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/DeptAddRequest.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/DeptUpdateSortRequest.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/DeptUpdateSortRequest.class new file mode 100644 index 00000000..af75c48c Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/DeptUpdateSortRequest.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/PermissionAddRequest.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/PermissionAddRequest.class new file mode 100644 index 00000000..7a9d45f6 Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/PermissionAddRequest.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/PositionRequest.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/PositionRequest.class new file mode 100644 index 00000000..fc4e85f1 Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/PositionRequest.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/HrmsCode.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/HrmsCode.class new file mode 100644 index 00000000..97d00bbb Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/HrmsCode.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/PositionResponse.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/PositionResponse.class new file mode 100644 index 00000000..f264f41c Binary files /dev/null and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/PositionResponse.class differ diff --git a/dq-framework-utils/pom.xml b/dq-framework-utils/pom.xml index 3e74ef4a..3a2d7d9d 100644 --- a/dq-framework-utils/pom.xml +++ b/dq-framework-utils/pom.xml @@ -32,5 +32,25 @@ dq-framework-common 1.0-SNAPSHOT + + com.aliyun.oss + aliyun-sdk-oss + 2.8.2 + + + org.apache.poi + poi + 4.0.1 + + + org.apache.poi + poi-ooxml + 4.0.1 + + + org.apache.poi + poi-ooxml-schemas + 4.0.1 + \ No newline at end of file diff --git a/dq-framework-utils/src/main/java/com/daqing/framework/utils/OssFileUtils.java b/dq-framework-utils/src/main/java/com/daqing/framework/utils/OssFileUtils.java new file mode 100644 index 00000000..c02b95ad --- /dev/null +++ b/dq-framework-utils/src/main/java/com/daqing/framework/utils/OssFileUtils.java @@ -0,0 +1,49 @@ +package com.daqing.framework.utils; + +import com.aliyun.oss.OSSClient; +import com.aliyun.oss.model.PutObjectRequest; +import com.aliyun.oss.model.UploadFileResult; +import org.springframework.web.multipart.MultipartFile; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.util.Date; + +/** + * 阿里云oss文件上传工具类 + * + * @auther River + * @date 2020/9/16 15:50 + */ +public class OssFileUtils { + + private static String endpoint = "oss-on-beijing.aliyuncs.cn"; // 访问地址 + + private static String accessKeyId = "LTAICMr9msM1kJ"; // 访问权限 + + private static String accessKeySecret = "i1b4a2mtKxsXJl674mhjTEwAKQxk"; // 加密操作 + + private static String bucketName = "river1998"; //仓库名称 + + public static String uploadFile(String objectkey, MultipartFile multipartFile) throws IOException { + + // 创建OSSClient实例 + OSSClient ossClient = new OSSClient(endpoint,accessKeyId,accessKeySecret); + if (multipartFile.getSize() != 0 && "".equals(multipartFile.getName())){ + // 创建PutObjectRequest实例 第二个参数表示上传到oss时需要指定的包含文件后缀名在内的完整路径 + PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, multipartFile.getName(), new ByteArrayInputStream(multipartFile.getBytes())); + /*如果需要上传时设置存储类型与访问权限，请参考以下示例代码。 + ObjectMetadata metadata = new ObjectMetadata(); + metadata.setHeader(OSSHeaders.OSS_STORAGE_CLASS, StorageClass.Standard.toString()); + metadata.setObjectAcl(CannedAccessControlList.Private); + putObjectRequest.setMetadata(metadata);*/ + //上传文件 + ossClient.putObject(putObjectRequest); + ossClient.shutdown(); + } + // 设置这个文件地址的有效时间 + Date expiration = new Date(new Date().getTime() + 3600l * 1000 * 24 * 365 * 10); + String url = ossClient.generatePresignedUrl(bucketName, objectkey, expiration).toString(); + return url; + } +} diff --git a/dq-framework-utils/src/main/java/com/daqing/framework/utils/poi/ExcelAttribute.java b/dq-framework-utils/src/main/java/com/daqing/framework/utils/poi/ExcelAttribute.java new file mode 100644 index 00000000..06d41b47 --- /dev/null +++ b/dq-framework-utils/src/main/java/com/daqing/framework/utils/poi/ExcelAttribute.java @@ -0,0 +1,29 @@ +package com.daqing.framework.utils.poi; + +/** + * @auther River + * @date 2020/9/16 17:10 + */ +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.FIELD) +public @interface ExcelAttribute { + /** + * 对应的列名称 + */ + String name() default ""; + + /** + * excel列的索引 + */ + int sort(); + + /** + * 字段类型对应的格式 + */ + String format() default ""; +} diff --git a/dq-framework-utils/src/main/java/com/daqing/framework/utils/poi/ExcelExportUtil.java b/dq-framework-utils/src/main/java/com/daqing/framework/utils/poi/ExcelExportUtil.java new file mode 100644 index 00000000..cfbed970 --- /dev/null +++ b/dq-framework-utils/src/main/java/com/daqing/framework/utils/poi/ExcelExportUtil.java @@ -0,0 +1,87 @@ +package com.daqing.framework.utils.poi; + +import lombok.Data; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import javax.servlet.http.HttpServletResponse; + +import java.io.InputStream; +import java.lang.reflect.Field; +import java.net.URLEncoder; +import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; + +/** + * 导出Excel工具类 + * 基于模板打印的方式导出： + */ +@Data +public class ExcelExportUtil { + + private int rowIndex; //写入数据的起始行 + private int styleIndex; //需要提取的样式所在的行号 + private Class clazz; //对象的字节码 + private Field fields[]; //对象中的所有属性 + + public ExcelExportUtil(Class clazz, int rowIndex, int styleIndex) { + this.clazz = clazz; + this.rowIndex = rowIndex; + this.styleIndex = styleIndex; + fields = clazz.getDeclaredFields(); + } + + /** + * 基于注解导出 + * 参数： + * response： + * InputStream:模板的输入流 + * objs：数据 + * fileName：生成的文件名 + */ + public void export(HttpServletResponse response, InputStream is, List objs, String fileName) throws Exception { + + //1.根据模板创建工作簿 + XSSFWorkbook workbook = new XSSFWorkbook(is); + //2.读取工作表 + Sheet sheet = workbook.getSheetAt(0); + //3.提取公共的样式 + CellStyle[] styles = getTemplateStyles(sheet.getRow(styleIndex)); + //4.根据数据创建每一行和每一个单元格的数据2 + AtomicInteger datasAi = new AtomicInteger(rowIndex); //数字 + for (T t : objs) { + //datasAi.getAndIncrement() ：获取数字，并++ i++ + Row row = sheet.createRow(datasAi.getAndIncrement()); + for (int i = 0; i < styles.length; i++) { + Cell cell = row.createCell(i); + cell.setCellStyle(styles[i]); + for (Field field : fields) { + if (field.isAnnotationPresent(ExcelAttribute.class)) { + field.setAccessible(true); + ExcelAttribute ea = field.getAnnotation(ExcelAttribute.class); + if (i == ea.sort()) { + if (field.get(t) != null) { + cell.setCellValue(field.get(t).toString()); + } + } + } + } + } + } + fileName = URLEncoder.encode(fileName, "UTF-8"); + response.setContentType("application/octet-stream"); + response.setHeader("content-disposition", "attachment;filename=" + new String(fileName.getBytes("ISO8859-1"))); + response.setHeader("filename", fileName); + workbook.write(response.getOutputStream()); + } + + CellStyle[] getTemplateStyles(Row row) { + CellStyle[] styles = new CellStyle[row.getLastCellNum()]; + for (int i = 0; i < row.getLastCellNum(); i++) { + styles[i] = row.getCell(i).getCellStyle(); + } + return styles; + } +} \ No newline at end of file diff --git a/dq-framework-utils/src/main/java/com/daqing/framework/utils/poi/ExcelImportUtil.java b/dq-framework-utils/src/main/java/com/daqing/framework/utils/poi/ExcelImportUtil.java new file mode 100644 index 00000000..9caabad2 --- /dev/null +++ b/dq-framework-utils/src/main/java/com/daqing/framework/utils/poi/ExcelImportUtil.java @@ -0,0 +1,122 @@ +package com.daqing.framework.utils.poi; + +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.DateUtil; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; + +import java.io.InputStream; +import java.lang.reflect.Field; +import java.math.BigDecimal; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class ExcelImportUtil { + + private Class clazz; + private Field fields[]; + + public ExcelImportUtil(Class clazz) { + this.clazz = clazz; + fields = clazz.getDeclaredFields(); + } + + /** + * 基于注解读取excel + */ + public List readExcel(InputStream is, int rowIndex, int cellIndex) { + List list = new ArrayList<>(); + T entity = null; + try { + XSSFWorkbook workbook = new XSSFWorkbook(is); + Sheet sheet = workbook.getSheetAt(0); + // 不准确 + // int rowLength = sheet.getLastRowNum(); + // System.out.println(sheet.getLastRowNum()); + for (int rowNum = rowIndex; rowNum <= sheet.getLastRowNum(); rowNum++) { + Row row = sheet.getRow(rowNum); + entity = (T) clazz.newInstance(); + // System.out.println(row.getLastCellNum()); + for (int j = cellIndex; j < row.getLastCellNum(); j++) { + Cell cell = row.getCell(j); + for (Field field : fields) { + if (field.isAnnotationPresent(ExcelAttribute.class)) { + field.setAccessible(true); + ExcelAttribute ea = field.getAnnotation(ExcelAttribute.class); + if (j == ea.sort()) { + field.set(entity, covertAttrType(field, cell)); + } + } + } + } + Field field = entity.getClass().getDeclaredField("index"); + field.setAccessible(true); + field.set(entity, rowNum); + list.add(entity); + } + } catch (Exception e) { + e.printStackTrace(); + } + return list; + } + + /** + * 类型转换 将cell 单元格格式转为 字段类型 + */ + private Object covertAttrType(Field field, Cell cell) throws Exception { + String fieldType = field.getType().getSimpleName(); + if ("String".equals(fieldType)) { + return getValue(cell); + } else if ("Date".equals(fieldType)) { + return new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").parse(getValue(cell)); + } else if ("int".equals(fieldType) || "Integer".equals(fieldType)) { + return Integer.parseInt(getValue(cell)); + } else if ("double".equals(fieldType) || "Double".equals(fieldType)) { + return Double.parseDouble(getValue(cell)); + } else { + return null; + } + } + + + /** + * 格式转为String + * + * @param cell + * @return + */ + public String getValue(Cell cell) { + if (cell == null) { + return ""; + } + switch (cell.getCellType()) { + case STRING: + return cell.getRichStringCellValue().getString().trim(); + case NUMERIC: + if (DateUtil.isCellDateFormatted(cell)) { + Date dt = DateUtil.getJavaDate(cell.getNumericCellValue()); + return new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(dt); + } else { + // 防止数值变成科学计数法 + String strCell = ""; + Double num = cell.getNumericCellValue(); + BigDecimal bd = new BigDecimal(num.toString()); + if (bd != null) { + strCell = bd.toPlainString(); + } + // 去除 浮点型 自动加的 .0 + if (strCell.endsWith(".0")) { + strCell = strCell.substring(0, strCell.indexOf(".")); + } + return strCell; + } + case BOOLEAN: + return String.valueOf(cell.getBooleanCellValue()); + default: + return ""; + } + } +} diff --git a/dq-framework-utils/target/classes/com/daqing/framework/utils/PageUtils.class b/dq-framework-utils/target/classes/com/daqing/framework/utils/PageUtils.class new file mode 100644 index 00000000..92c8442e Binary files /dev/null and b/dq-framework-utils/target/classes/com/daqing/framework/utils/PageUtils.class differ diff --git a/dq-framework-utils/target/classes/com/daqing/framework/utils/Query.class b/dq-framework-utils/target/classes/com/daqing/framework/utils/Query.class new file mode 100644 index 00000000..61fc91e4 Binary files /dev/null and b/dq-framework-utils/target/classes/com/daqing/framework/utils/Query.class differ diff --git a/dq-framework-utils/target/classes/com/daqing/framework/utils/SnowflakeIdUtils.class b/dq-framework-utils/target/classes/com/daqing/framework/utils/SnowflakeIdUtils.class new file mode 100644 index 00000000..5a362860 Binary files /dev/null and b/dq-framework-utils/target/classes/com/daqing/framework/utils/SnowflakeIdUtils.class differ diff --git a/lib/javax.ejb.jar b/lib/javax.ejb.jar new file mode 100644 index 00000000..4ebf5ecd Binary files /dev/null and b/lib/javax.ejb.jar differ diff --git a/lib/javax.jms.jar b/lib/javax.jms.jar new file mode 100644 index 00000000..d31451ad Binary files /dev/null and b/lib/javax.jms.jar differ diff --git a/lib/javax.persistence.jar b/lib/javax.persistence.jar new file mode 100644 index 00000000..21d80e0e Binary files /dev/null and b/lib/javax.persistence.jar differ diff --git a/lib/javax.resource.jar b/lib/javax.resource.jar new file mode 100644 index 00000000..696a2345 Binary files /dev/null and b/lib/javax.resource.jar differ diff --git a/lib/javax.servlet.jar b/lib/javax.servlet.jar new file mode 100644 index 00000000..0519e4a4 Binary files /dev/null and b/lib/javax.servlet.jar differ diff --git a/lib/javax.servlet.jsp.jar b/lib/javax.servlet.jsp.jar new file mode 100644 index 00000000..9c0631ce Binary files /dev/null and b/lib/javax.servlet.jsp.jar differ diff --git a/lib/javax.servlet.jsp.jstl.jar b/lib/javax.servlet.jsp.jstl.jar new file mode 100644 index 00000000..7be17cc7 Binary files /dev/null and b/lib/javax.servlet.jsp.jstl.jar differ diff --git a/lib/javax.transaction.jar b/lib/javax.transaction.jar new file mode 100644 index 00000000..729c6952 Binary files /dev/null and b/lib/javax.transaction.jar differ