数据库版本更新,语法修改,数据库连接更新,华为云内网连接

chaohu
chen 3 years ago
parent e5d85bc9b9
commit 8f6c66e9b8
  1. 6
      src/main/java/com/msdw/tms/service/impl/ExperimentalReportServiceImpl.java
  2. 2
      src/main/resources/application-chaohu.properties
  3. 2
      src/main/resources/application.properties
  4. 4
      src/main/resources/mapper/tms/ProjectRecordDao.xml

@ -41,12 +41,12 @@ public class ExperimentalReportServiceImpl extends ServiceImpl<ExperimentalRepor
//python实验 //python实验
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = new HashMap<>();
map.put("report", result); map.put("report", result);
if (systemId == 1 | systemId == 4 | systemId == 5) { // if (systemId == 1 | systemId == 4 | systemId == 5) {
List<AchievementManagementVO> data = achievementManagementDao.queryPythonTest(recordId); List<AchievementManagementVO> data = achievementManagementDao.queryPythonTest(recordId);
map.put("data", data); map.put("data", data);
return R.ok().put("data", map); return R.ok().put("data", map);
} // }
return R.ok().put("data", map); // return R.ok().put("data", map);
} }
//虚拟实验 //虚拟实验

@ -2,7 +2,7 @@ server.port=9001
server.servlet.context-path=/evaluation server.servlet.context-path=/evaluation
#\u6B63\u5F0F\u6570\u636E\u5E93\u8FDE\u63A5 #\u6B63\u5F0F\u6570\u636E\u5E93\u8FDE\u63A5
spring.datasource.url=jdbc:mysql://rm-wz90d92p0pf083nxzno.mysql.rds.aliyuncs.com:3306/chaohu?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai spring.datasource.url=jdbc:mysql://192.168.0.245:3306/chaohu?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
spring.datasource.username=root spring.datasource.username=root
spring.datasource.password=HuoRan@2021 spring.datasource.password=HuoRan@2021
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver

@ -1,2 +1,2 @@
#\u9009\u62E9\u6307\u5B9A\u73AF\u5883,\u76EE\u524D\u53EA\u6709\u6D4B\u8BD5\u548C\u6B63\u5F0F\u73AF\u5883 #\u9009\u62E9\u6307\u5B9A\u73AF\u5883,\u76EE\u524D\u53EA\u6709\u6D4B\u8BD5\u548C\u6B63\u5F0F\u73AF\u5883
spring.profiles.active=prod spring.profiles.active=chaohu

@ -62,7 +62,7 @@
<if test="systemId!=null and systemId!=''"> <if test="systemId!=null and systemId!=''">
and t.systemId = #{systemId} and t.systemId = #{systemId}
</if> </if>
GROUP BY c.recordId desc GROUP BY c.recordId
</select> </select>
<!-- 考核记录 --> <!-- 考核记录 -->
@ -230,7 +230,7 @@
INNER JOIN tms_experimental_report re ON re.eventId = r.recordId INNER JOIN tms_experimental_report re ON re.eventId = r.recordId
WHERE c.userId = #{userId} WHERE c.userId = #{userId}
AND projectPermissions = 0 AND projectPermissions = 0
GROUP BY c.recordId DESC; GROUP BY c.recordId
</select> </select>
<!-- 考核记录 --> <!-- 考核记录 -->

Loading…
Cancel
Save