| | |
| | | <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> |
| | | <outputRelativeToContentRoot value="true" /> |
| | | <module name="ruoyi-framework" /> |
| | | <module name="ruoyi-applet" /> |
| | | <module name="ruoyi-system" /> |
| | | <module name="ruoyi-common" /> |
| | | <module name="ruoyi-generator" /> |
| | |
| | | <module name="ruoyi-admin" /> |
| | | </profile> |
| | | </annotationProcessing> |
| | | <bytecodeTargetLevel> |
| | | <module name="ruoyi-applet" target="1.8" /> |
| | | </bytecodeTargetLevel> |
| | | </component> |
| | | </project> |
| | |
| | | <option value="$PROJECT_DIR$/generator/pom.xml" /> |
| | | </list> |
| | | </option> |
| | | <option name="ignoredFiles"> |
| | | <set> |
| | | <option value="$PROJECT_DIR$/ruoyi-applet/pom.xml" /> |
| | | </set> |
| | | </option> |
| | | </component> |
| | | <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" /> |
| | | </project> |
| | |
| | | <module>ruoyi-quartz</module> |
| | | <module>ruoyi-generator</module> |
| | | <module>ruoyi-common</module> |
| | | <module>ruoyi-applet</module> |
| | | </modules> |
| | | <packaging>pom</packaging> |
| | | |
| | |
| | | private ISysUserService sysUserService; |
| | | |
| | | |
| | | |
| | | /** |
| | | * 获取谱系图分页列表 |
| | | */ |
| | |
| | | @ApiOperation(value = "谱系图-获取谱系图分页列表",response = TPedigreeChartQuery.class) |
| | | @PostMapping(value = "/api/t-pedigree-chart/pageList") |
| | | public R<PageInfo<TPedigreeChartVO>> pageList(@RequestBody String param) { |
| | | |
| | | TPedigreeChartQuery query = JSON.parseObject(param, TPedigreeChartQuery.class); |
| | | SysUser sysUser = sysUserService.selectUserById(tokenService.getLoginUser().getUserId()); |
| | | if (sysUser.getRoleType().equals("2")){ |
| | | query.setRoleType(2); |
| | | List<String> allProjectIds = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getUserId, tokenService.getLoginUser().getUserId()) |
| | | .list().stream().map(TProjectTeamStaff::getTeamId).collect(Collectors.toList()); |
| | | if (!allProjectIds.isEmpty()){ List<String> projectIds = projectTeamService.lambdaQuery().in(TProjectTeam::getId, allProjectIds) |
| | | if (!allProjectIds.isEmpty()){ |
| | | List<String> projectIds = projectTeamService.lambdaQuery().in(TProjectTeam::getId, allProjectIds) |
| | | .list().stream().map(TProjectTeam::getId).collect(Collectors.toList()); |
| | | if (projectIds.isEmpty()){ |
| | | return R.ok(new PageInfo<>()); |
| | |
| | | } |
| | | }else if (!sysUser.getRoleType().equals("1")){ |
| | | query.setRoleType(3); |
| | | |
| | | List<String> allProjectIds = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getUserId, tokenService.getLoginUser().getUserId()) |
| | | .list().stream().map(TProjectTeamStaff::getTeamId).collect(Collectors.toList()); |
| | | if (!allProjectIds.isEmpty()){ List<String> projectIds = projectTeamService.lambdaQuery().in(TProjectTeam::getId, allProjectIds) |
| | | .eq(TProjectTeam::getStatus, 1).list().stream().map(TProjectTeam::getId).collect(Collectors.toList()); |
| | | |
| | | if (projectIds.isEmpty()){ |
| | | return R.ok(new PageInfo<>()); |
| | | } |
| | | query.setProjectIds(projectIds); |
| | | }else{ |
| | | return R.ok(new PageInfo<>()); |
| | | |
| | | } |
| | | }else{ |
| | | query.setRoleType(1); |
| | |
| | | } |
| | | @Log(title = "谱系图-谱系图-删除谱系图", businessType = BusinessType.DELETE) |
| | | @ApiOperation(value = "谱系图-删除谱系图") |
| | | @Transactional |
| | | @DeleteMapping(value = "/open/t-pedigree-chart/deleteProgenitor") |
| | | public R<Boolean> deleteProgenitor(@RequestParam String id) { |
| | | pedigreeChartService.removeById(id); |
| | |
| | | @ApiOperation(value = "谱系图-删除菌种传代项",response = TPedigreeChartParentDTO.class) |
| | | @DeleteMapping(value = "/open/t-pedigree-chart/deleteProgenitorChild") |
| | | public R<Boolean> deleteProgenitorChild(@RequestParam String id) { |
| | | List<TPedigreeChartDetail> children = pedigreeChartDetailService.lambdaQuery().eq(TPedigreeChartDetail::getParentId, id) |
| | | .list(); |
| | | if (!children.isEmpty()){ |
| | | return R.fail("请先删除子项"); |
| | | } |
| | | pedigreeChartDetailService.removeById(id); |
| | | return R.ok(); |
| | | } |
| | |
| | | List<String> allProjectIds = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getUserId, tokenService.getLoginUser().getUserId()) |
| | | .eq(TProjectTeamStaff::getRoleType, 3) |
| | | .list().stream().map(TProjectTeamStaff::getTeamId).collect(Collectors.toList()); |
| | | if (allProjectIds.isEmpty()){ |
| | | allProjectIds.add("0"); |
| | | } |
| | | TProjectTeam projectTeam = projectTeamService.lambdaQuery().in(TProjectTeam::getId, allProjectIds) |
| | | .eq(TProjectTeam::getStatus, 1) |
| | | .orderByDesc(BaseModel::getCreateTime).last("limit 1").one(); |
| | |
| | | |
| | | |
| | | import com.alibaba.fastjson.JSON; |
| | | import com.alibaba.fastjson.JSONArray; |
| | | import com.alibaba.fastjson.JSONObject; |
| | | import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
| | | import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
| | | import com.ruoyi.common.annotation.Log; |
| | |
| | | } |
| | | return R.ok(); |
| | | } |
| | | |
| | | public static void main(String[] args) { |
| | | // String jsonStr = "[{\"id\":1,\"num1\":\"00:00\",\"num2\":\"19:00\",\"num3\":1,\"num4\":1,\"num5\":1,\"num6\":1,\"num7\":1}]"; |
| | | // JSONArray startingFareJsonArray = JSONArray.parseArray(jsonStr); |
| | | // for (int i = 0; i < startingFareJsonArray.size(); i++) { |
| | | // JSONObject jsonObject = startingFareJsonArray.getJSONObject(i); |
| | | // System.out.println(jsonObject.getString("num1")); |
| | | // System.out.println(jsonObject.getString("num2")); |
| | | // System.out.println(jsonObject.getInteger("num3")); |
| | | // } |
| | | Long temp =2027571910897541122L; |
| | | System.out.println(temp%20); |
| | | |
| | | } |
| | | /** |
| | | * 新增菌种库 |
| | | */ |
| | |
| | | # 项目相关配置 |
| | | spring: |
| | | profiles: |
| | | active: prod |
| | | active: test |
| | |
| | | # 开发环境配置 |
| | | server: |
| | | # 服务器的HTTP端口,默认为8080 |
| | | port: 8080 |
| | | port: 8082 |
| | | servlet: |
| | | # 应用的访问路径 |
| | | context-path: / |
| | | context-path: /culture/ |
| | | tomcat: |
| | | # tomcat的URI编码 |
| | | uri-encoding: UTF-8 |
| | |
| | | # redis 配置 |
| | | redis: |
| | | # 地址 |
| | | # host: 127.0.0.1 |
| | | # # 端口,默认为6379 |
| | | # port: 6379 |
| | | # # 数据库索引 |
| | | # database: 0 |
| | | # # 密码 |
| | | # password: 123456 |
| | | host: 127.0.0.1 |
| | | # 端口,默认为6379 |
| | | port: 16379 |
| | | port: 6379 |
| | | # 数据库索引 |
| | | database: 0 |
| | | # 密码 |
| | | password: 8f5z9g52gx4bg |
| | | password: 123456 |
| | | # 连接超时时间 |
| | | timeout: 10s |
| | | lettuce: |
| | |
| | | druid: |
| | | # 主库数据源 |
| | | master: |
| | | url: jdbc:mysql://172.27.0.13:3306/xizang?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=Asia/Shanghai |
| | | username: xzgt |
| | | password: changyun!6f2gshj6h3j |
| | | url: jdbc:mysql://127.0.0.1:10633/strain_library?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai |
| | | username: root |
| | | password: Laboratory@2025! |
| | | # 从库数据源 |
| | | slave: |
| | | # 从数据源开关/默认关闭 |
| | |
| | | accessPath: /file/ |
| | | allowExt: .jpg|.png|.gif|.jpeg|.doc|.docx|.apk|.MP4|.mp4|.pdf|.PDF|.xls|.xlsx|.rar|.zip|.rar |
| | | url: |
| | | # prefix: http://localhost:${server.port}${server.servlet.context-path} |
| | | prefix: https://xzgt.test.591taxi.cn:${server.port}${server.servlet.context-path} |
| | | wx: |
| | | conf: |
| | | appId: wxe91f1af7638aa5dd |
| | | secretId: a787e1a462715604e0c9528b6d8960d1 |
| | | #OSS及短信配置 |
| | | code: |
| | | config: |
| | | templateCodeTest: "SMS_154950909" |
| | | signNameTest: "阿里云短信测试" |
| | | accessKeyId: LTAI5tAdba8HtT1C6UqtSxBt |
| | | accessKeySecret: 0SRb6XGkciQDPWn2rYqbJtq2qRMDY8 |
| | | signName: "四川金达通信工程" |
| | | templateCode: "SMS_293985284" |
| | | cos: |
| | | client: |
| | | accessKey: AKIDCF5EF2c0DE1e5JK8r4EGJF4mNsMgp26x |
| | | secretKey: lLl184rUyFOOE0d5KNGC3kmfNsCWk4GU |
| | | bucket: xzgttest-1305134071 |
| | | bucketAddr: ap-chengdu |
| | | rootSrc: https://xzgttest-1305134071.cos.ap-chengdu.myqcloud.com/ |
| | | location: /xizang |
| | | sms: |
| | | enable: true |
| | | appId: 1400957506 |
| | | secretid: AKIDCF5EF2c0DE1e5JK8r4EGJF4mNsMgp26x |
| | | secretkey: lLl184rUyFOOE0d5KNGC3kmfNsCWk4GU |
| | | sign: 畅云出行 |
| | | com: |
| | | taxi591: |
| | | bank: |
| | | cer-path: /usr/local/bank/TrustPay.cer |
| | | base-url: http://hello.enjoy.abchina.com |
| | | enable: true |
| | | keystore-password: gggs6666 |
| | | pfx-path: /usr/local/bank/103882597000441.pfx |
| | | |
| | |
| | | # 开发环境配置 |
| | | server: |
| | | # 服务器的HTTP端口,默认为8080 |
| | | port: 8081 |
| | | port: 8082 |
| | | servlet: |
| | | # 应用的访问路径 |
| | | context-path: / |
| | |
| | | url: |
| | | # prefix: http://localhost:${server.port}${server.servlet.context-path} |
| | | prefix: https://xzgt.test.591taxi.cn:${server.port}${server.servlet.context-path} |
| | | wx: |
| | | conf: |
| | | appId: wxe91f1af7638aa5dd |
| | | secretId: a787e1a462715604e0c9528b6d8960d1 |
| | | #OSS及短信配置 |
| | | code: |
| | | config: |
| | | templateCodeTest: "SMS_154950909" |
| | | signNameTest: "阿里云短信测试" |
| | | accessKeyId: LTAI5tAdba8HtT1C6UqtSxBt |
| | | accessKeySecret: 0SRb6XGkciQDPWn2rYqbJtq2qRMDY8 |
| | | signName: "四川金达通信工程" |
| | | templateCode: "SMS_293985284" |
| | | cos: |
| | | client: |
| | | accessKey: AKIDCF5EF2c0DE1e5JK8r4EGJF4mNsMgp26x |
| | | secretKey: lLl184rUyFOOE0d5KNGC3kmfNsCWk4GU |
| | | bucket: xzgttest-1305134071 |
| | | bucketAddr: ap-chengdu |
| | | rootSrc: https://xzgttest-1305134071.cos.ap-chengdu.myqcloud.com/ |
| | | location: /xizang |
| | | sms: |
| | | enable: true |
| | | appId: 1400957506 |
| | | secretid: AKIDCF5EF2c0DE1e5JK8r4EGJF4mNsMgp26x |
| | | secretkey: lLl184rUyFOOE0d5KNGC3kmfNsCWk4GU |
| | | sign: 畅云出行 |
| | | com: |
| | | taxi591: |
| | | bank: |
| | | cer-path: D:\workspaces\工作文件\畅云\农业银行\正式\TrustPay.cer |
| | | base-url: http://hello.enjoy.abchina.com |
| | | enable: true |
| | | keystore-password: gggs6666 |
| | | pfx-path: D:\workspaces\工作文件\畅云\农业银行\正式\103882597000441.pfx |
| | | |
| | |
| | | @TableField("id") |
| | | private String id; |
| | | |
| | | |
| | | |
| | | @ApiModelProperty(value = "菌种选育保藏记录id") |
| | | @TableField("breeding_preserve_id") |
| | | private String breedingPreserveId; |
| | |
| | | @ApiModelProperty(value = "分离菌落编号") |
| | | @TableField("separate_bacterial_colonies_code") |
| | | private String separateBacterialColoniesCode; |
| | | @ApiModelProperty(value = "2.0新增字段培养皿编号") |
| | | @TableField("petri_dish_number") |
| | | private String petriDishNumber; |
| | | |
| | | |
| | | } |
| | |
| | | </if> |
| | | AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()} |
| | | </where> |
| | | order by create_time desc |
| | | order by strain_code desc |
| | | </select> |
| | | <select id="getDetailById" resultType="com.ruoyi.system.vo.TTrainLibraryWarehousingVO"> |
| | | select t1.* from t_train_library_warehousing t1 |
| | |
| | | <result property="updateTime" column="update_time" /> |
| | | <result property="remark" column="remark" /> |
| | | <result property="ifBlack" column="ifBlack" /> |
| | | <result property="allocateIp" column="allocateIp" /> |
| | | <association property="dept" javaType="SysDept" resultMap="deptResult" /> |
| | | <collection property="roles" javaType="java.util.List" resultMap="RoleResult" /> |
| | | </resultMap> |
| | |
| | | <sql id="selectUserVo"> |
| | | select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, |
| | | u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, |
| | | u.roleType, |
| | | u.roleType,u.allocateIp, |
| | | d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, |
| | | r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status |
| | | from sys_user u |
| | |
| | | select u.user_id AS userId, u.dept_id AS deptId, u.user_name AS userName, u.nick_name AS nickName, u.email AS email, u.avatar AS avatar, |
| | | u.phonenumber AS phonenumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp, |
| | | u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,u.ifBlack AS ifBlack, |
| | | u.roleType,u.sign_picture as signPicture, |
| | | u.roleType,u.sign_picture as signPicture,u.allocateIp, |
| | | ur.role_id AS roleId,sr.role_name AS roleName,u.deptName as deptName |
| | | from sys_user u |
| | | left join sys_user_role ur on u.user_id = ur.user_id |
| | |
| | | </select> |
| | | <select id="selectList" resultType="com.ruoyi.common.core.domain.entity.SysUser"> |
| | | select u.user_id AS userId, u.dept_id AS deptId, u.user_name AS userName, u.nick_name AS nickName, u.email AS email, u.avatar AS avatar, |
| | | u.phonenumber AS phonenumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp, |
| | | u.phonenumber AS phonenumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp,u.allocateIp, |
| | | u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,u.ifBlack AS ifBlack |
| | | from sys_user u |
| | | WHERE u.del_flag = 0 |
| | |
| | | u.phonenumber AS phonenumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp,u.operating_time AS operatingTime,u.operating_person AS operatingPerson, |
| | | u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,u.ifBlack AS ifBlack, |
| | | r.role_id AS roleId, r.role_name AS roleName, r.role_key AS roleKey, r.role_sort AS roleSort, r.data_scope AS dataScope, r.status as role_status,u.deptName as deptName |
| | | ,u.roleType as roleType |
| | | ,u.roleType as roleType,u.allocateIp |
| | | from sys_user u |
| | | left join sys_user_role ur on u.user_id = ur.user_id |
| | | left join sys_role r on r.role_id = ur.role_id |
| | |
| | | <if test="createBy != null and createBy != ''">create_by,</if> |
| | | <if test="remark != null and remark != ''">remark,</if> |
| | | <if test="ifBlack != null">ifBlack,</if> |
| | | <if test="allocateIp != null">allocateIp,</if> |
| | | create_time |
| | | )values( |
| | | <if test="userId != null and userId != ''">#{userId},</if> |
| | |
| | | <if test="createBy != null and createBy != ''">#{createBy},</if> |
| | | <if test="remark != null and remark != ''">#{remark},</if> |
| | | <if test="ifBlack != null">#{ifBlack},</if> |
| | | <if test="allocateIp != null">#{allocateIp},</if> |
| | | sysdate() |
| | | ) |
| | | </insert> |
| | |
| | | <if test="operatingTime != null">operating_time = #{operatingTime},</if> |
| | | <if test="operatingPerson != null">operating_person = #{operatingPerson},</if> |
| | | <if test="roleType != null">roleType = #{roleType},</if> |
| | | <if test="allocateIp != null">allocateIp = #{allocateIp},</if> |
| | | update_time = sysdate() |
| | | </set> |
| | | where user_id = #{userId} |
| | |
| | | <if test="query.generationType != null"> |
| | | and generation_type = #{query.generationType} |
| | | </if> |
| | | <if test="query.roleType == 1"> |
| | | and status = 2 |
| | | </if> |
| | | <if test="query.roleType == 2"> |
| | | and status = 2 |
| | | </if> |
| | | <if test="query.roleType == 3"> |
| | | and status = 2 or status = 1 |
| | | </if> |
| | | <if test="query.projectIds != null and query.projectIds.size() > 0"> |
| | | and project_id in |
| | | <foreach item="item" collection="query.projectIds" separator="," open="(" close=")" index=""> |
| | |
| | | where pedigree_chart_id = #{query.id} |
| | | and status = 1 |
| | | and type = 1 |
| | | and vaccinate_id is not null |
| | | and preserve_id is null |
| | | and audit_status = 1 |
| | | and disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()} |
| | | order by create_time desc |
| | | </select> |
| | | <select id="pageListCountDetail" resultType="com.ruoyi.system.vo.TPedigreeChartDetailVO"> |
| | | select * from t_pedigree_chart_detail |
| | | where pedigree_chart_id = #{query.id} |
| | | and status = 1 |
| | | and type = 2 |
| | | and audit_status = 1 |
| | | and disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()} |
| | | order by create_time desc |
| | | </select> |
| | | |
| | | |
| | |
| | | </if> |
| | | AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()} |
| | | </where> |
| | | order by create_time desc |
| | | order by strain_code desc |
| | | </select> |
| | | <select id="getDetailById" resultType="com.ruoyi.system.vo.TTrainLibraryWarehousingVO"> |
| | | select t1.* from t_train_library_warehousing t1 |