Skip to content

S
syyl
提交 ca83b277 authored 作者: renjiancai's avatar renjiancai
浏览文件
操作

--no commit message

上级 05248bf9
显示空白字符变更
内嵌 并排
正在显示 包含 30 行增加 和 307 行删除
com.zrqx.system/.factorypath
浏览文件 @ ca83b277
......@@ -36,6 +36,11 @@
<factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-lang3/3.7/commons-lang3-3.7.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/aspectj/aspectjweaver/1.8.13/aspectjweaver-1.8.13.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/scala-lang/scala-library/2.11.0/scala-library-2.11.0.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/com/itextpdf/itextpdf/5.5.13/itextpdf-5.5.13.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/com/itextpdf/itext-asian/5.2.0/itext-asian-5.2.0.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/net/sourceforge/cpdetector/cpdetector/1.0.7/cpdetector-1.0.7.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/mozilla/intl/chardet/1.0/chardet-1.0.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-data-redis/2.0.6.RELEASE/spring-boot-starter-data-redis-2.0.6.RELEASE.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter/2.0.6.RELEASE/spring-boot-starter-2.0.6.RELEASE.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot/2.0.6.RELEASE/spring-boot-2.0.6.RELEASE.jar" enabled="true" runInBatchMode="false"/>
......@@ -99,7 +104,6 @@
<factorypathentry kind="VARJAR" id="M2_REPO/joda-time/joda-time/2.9.9/joda-time-2.9.9.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/antlr/antlr-runtime/3.4/antlr-runtime-3.4.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/antlr/stringtemplate/3.2.1/stringtemplate-3.2.1.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/com/google/code/gson/gson/2.8.5/gson-2.8.5.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-math/2.2/commons-math-2.2.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/com/netflix/archaius/archaius-core/0.7.6/archaius-core-0.7.6.jar" enabled="true" runInBatchMode="false"/>
......@@ -184,6 +188,7 @@
<factorypathentry kind="EXTJAR" id="E:\Program Files\Java\jdk1.8.0_161\jre\..\lib\jconsole.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="EXTJAR" id="E:\Program Files\Java\jdk1.8.0_161\jre\..\lib\tools.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/mysql/mysql-connector-java/5.1.47/mysql-connector-java-5.1.47.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/jsoup/jsoup/1.7.3/jsoup-1.7.3.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/io/springfox/springfox-swagger2/2.7.0/springfox-swagger2-2.7.0.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/io/swagger/swagger-annotations/1.5.13/swagger-annotations-1.5.13.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/io/swagger/swagger-models/1.5.13/swagger-models-1.5.13.jar" enabled="true" runInBatchMode="false"/>
......
com.zrqx.system/src/main/java/com/zrqx/system/bg/controller/question/DesignQuestionController.java
浏览文件 @ ca83b277
......@@ -81,6 +81,8 @@ public class DesignQuestionController {
design.setUpdateTime(new Date());
examinationService.updateByPrimaryKeySelective(design);
}
if(form.getModel()!=null) {
if(form.getModel().equals(1)) {
Example example = examinationQuestionService.createExample();
example.createCriteria().andEqualTo("examinationId", form.getExaminationId());
......@@ -97,6 +99,7 @@ public class DesignQuestionController {
}
}
}
}
return CallBack.success(design.getId());
}
@ApiOperation(value = "分页查询设计问卷列表", notes = "设计问卷列表")
......
com.zrqx.system/src/main/java/com/zrqx/system/fg/controller/question/FgExaminationController.java
浏览文件 @ ca83b277
......@@ -7,14 +7,13 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.github.pagehelper.PageInfo;
import com.zrqx.core.constant.system.SystemRequestPath;
import com.zrqx.core.form.sysuser.fg.user.LoginUserInfo;
import com.zrqx.core.util.response.CallBack;
import com.zrqx.core.vo.system.bg.examination.ExaminationQuestionListVo;
import com.zrqx.core.vo.system.fg.examination.FgExaminationVo;
import com.zrqx.system.commons.redis.Redis;
import com.zrqx.system.fg.service.question.FgExaminationService;
import com.zrqx.system.fg.service.question.FgQuestionService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -35,11 +34,18 @@ public class FgExaminationController {
@ApiOperation(value = "首页-问卷调查" , notes = "首页-问卷调查")
@GetMapping(value = SystemRequestPath.LIST )
public CallBack<List<ExaminationQuestionListVo>> list(){
LoginUserInfo userInfo = redis.getMember();
List<ExaminationQuestionListVo> list = examinationService.queryFgExamination(userInfo.getUserId());
public CallBack<List<FgExaminationVo>> list(){
//LoginUserInfo userInfo = redis.getMember();
List<FgExaminationVo> list = examinationService.queryFgExamination();
return CallBack.success(list);
}
/*@ApiOperation(value = "问卷调查列表页" , notes = "问卷调查列表页")
@GetMapping(value = SystemRequestPath.PAGE )
public CallBack<PageInfo<ExaminationQuestionListVo>> page(){
//LoginUserInfo userInfo = redis.getMember();
List<ExaminationQuestionListVo> list = examinationService.queryFgExamination();
return CallBack.success(list);
}*/
/*@ApiOperation(value = "添加试题", notes = "添加试题")
@PostMapping(value = SystemRequestPath.ADD)
public CallBack<Boolean> add(@RequestBody SaveQuestionForm form) {
......
com.zrqx.system/src/main/java/com/zrqx/system/fg/mapper/question/FgExaminationMapper.java
浏览文件 @ ca83b277
......@@ -14,6 +14,7 @@ import com.zrqx.core.model.system.Examination;
import com.zrqx.core.vo.system.bg.examination.DesignQuestionListVo;
import com.zrqx.core.vo.system.bg.examination.ExaminationListVo;
import com.zrqx.core.vo.system.bg.examination.ExaminationQuestionListVo;
import com.zrqx.core.vo.system.fg.examination.FgExaminationVo;
public interface FgExaminationMapper extends BaseMapper<Examination> {
/** 分页查询*/
......@@ -53,13 +54,13 @@ public interface FgExaminationMapper extends BaseMapper<Examination> {
Integer queryStatistics(@Param("form")AnswerForm form);
@Select("<script>"
+ "SELECT id,text,beginTime,endTime,userName FROM sys_examination where 1=1"
+ "<if test='"+ NOTBLANK +"(userId)'>"
/*+ "<if test='"+ NOTBLANK +"(userId)'>"
+ " and userId = #{userId})"
+ "</if>"
+ "</if>"*/
+ "<if test='"+ NOTBLANK +"(currentTime)'>"
+ " and endTime &gt;=concat(#{currentTime})"
+ "</if>"
+ "ORDER BY createTime DESC LIMIT 0,1"
+ " ORDER BY createTime DESC LIMIT 0,1"
+ "</script>")
List<ExaminationQuestionListVo> queryFgExamination(@Param("userId")String userId,@Param("currentTime")String currentTime);
List<FgExaminationVo> queryFgExamination(@Param("currentTime")String currentTime);
}
com.zrqx.system/src/main/java/com/zrqx/system/fg/service/question/FgExaminationService.java
浏览文件 @ ca83b277
......@@ -4,11 +4,11 @@ import java.util.List;
import com.zrqx.core.model.system.Examination;
import com.zrqx.core.service.BaseService;
import com.zrqx.core.vo.system.bg.examination.ExaminationQuestionListVo;
import com.zrqx.core.vo.system.fg.examination.FgExaminationVo;
public interface FgExaminationService extends BaseService<Examination,String>{
List<ExaminationQuestionListVo> queryFgExamination(String userId);
List<FgExaminationVo> queryFgExamination();
/*PageInfo<ExaminationListVo> page(QueryExaminationForm form, PageParam pageParam);
......
com.zrqx.system/src/main/java/com/zrqx/system/fg/service/question/FgExaminationServiceImpl.java
浏览文件 @ ca83b277
......@@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
import com.zrqx.core.mapper.BaseMapper;
import com.zrqx.core.model.system.Examination;
import com.zrqx.core.service.BaseServiceImpl;
import com.zrqx.core.vo.system.bg.examination.ExaminationQuestionListVo;
import com.zrqx.core.vo.system.fg.examination.FgExaminationVo;
import com.zrqx.system.fg.mapper.question.FgExaminationMapper;
/**
......@@ -29,11 +29,11 @@ public class FgExaminationServiceImpl extends BaseServiceImpl<Examination,String
}
@Override
public List<ExaminationQuestionListVo> queryFgExamination(String userId) {
public List<FgExaminationVo> queryFgExamination() {
// TODO Auto-generated method stub
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式
String currentTime = df.format(new Date());
return mapper.queryFgExamination(userId,currentTime);
return mapper.queryFgExamination(currentTime);
}
/*@Override
......
com.zrqx.system/target/classes/application.yml deleted 100644 → 0
浏览文件 @ 05248bf9
mybatis:
type-aliases-package: com.zrqx.core.model
mapper:
mappers:
- com.zrqx.core.mapper.BaseMapper
not-empty: false
i-d-e-n-t-i-t-y: MYSQL
style: normal
b-e-f-o-r-e: true
pagehelper:
helperDialect: mysql
reasonable: true
supportMethodsArguments: true
params: count=countSql
spring:
main:
allow-bean-definition-overriding: true #2.1.0 多个接口上的@FeignClient(“相同服务名”)会报错 ，允许覆盖
jackson:
date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
http:
multipart:
maxFileSize: 20Mb
maxRequestSize: 20Mb
feign:
hystrix:
enabled: true
ribbon:
ConnectTimeout: 60000
ReadTimeout: 60000
hystrix:
command:
default:
execution:
isolation:
strategy: SEMAPHORE
thread:
timeoutInMilliseconds: 120000
\ No newline at end of file
com.zrqx.system/target/classes/assembly.xml deleted 100644 → 0
浏览文件 @ 05248bf9
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
<id>package</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>${basedir}/src/main/resources</directory>
<includes>
<include>*.yml</include>
<include>*.xml</include>
<include>static/**</include>
<include>templates/**</include>
<include>*.properties</include>
<include>*.txt</include>
</includes>
<filtered>true</filtered>
<outputDirectory>${file.separator}${project.artifactId}</outputDirectory>
</fileSet>
<fileSet>
<directory>src/main/resources/runScript</directory>
<outputDirectory>${file.separator}${project.artifactId}</outputDirectory>
</fileSet>
<fileSet>
<directory>${project.build.directory}/lib</directory>
<outputDirectory>${file.separator}${project.artifactId}/lib</outputDirectory>
<includes>
<include>*.jar</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.build.directory}/</directory>
<outputDirectory>${file.separator}${project.artifactId}</outputDirectory>
<includes>
<include>*.jar</include>
</includes>
</fileSet>
</fileSets>
</assembly>
\ No newline at end of file
com.zrqx.system/target/classes/bootstrap.yml deleted 100644 → 0
浏览文件 @ 05248bf9
server:
port: 8606
spring:
cloud:
config:
uri: http://localhost:8688 #配置中心地址
name: system
profile: prod
label: master
\ No newline at end of file
com.zrqx.system/target/classes/logback.xml deleted 100644 → 0
浏览文件 @ 05248bf9
<?xml version="1.0" encoding="UTF-8"?>
<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.padual.com/java/logback.xsd"
debug="false" scan="true" scanPeriod="30 second">
<!--读取配置中心的属性-->
<springProperty scope="context" name="name" source="spring.application.name"/>
<property name="ROOT" value="/opt/logs/syyl/sysuser/" />
<property name="FILESIZE" value="10MB" />
<property name="MAXHISTORY" value="60" />
<property name="DATETIME" value="yyyy-MM-dd HH:mm:ss" />
<!-- 控制台打印 -->
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder charset="utf-8">
<pattern>[%-5level] %d{${DATETIME}} [%thread] %logger{36} - %m%n
</pattern>
</encoder>
</appender>
<!-- ERROR 输入到文件，按日期和文件大小 -->
<appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder charset="utf-8">
<pattern>[%-5level] %d{${DATETIME}} [%thread] %logger{36} - %m%n
</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>ERROR</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${ROOT}%d/error.%i.log</fileNamePattern>
<maxHistory>${MAXHISTORY}</maxHistory>
<timeBasedFileNamingAndTriggeringPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>${FILESIZE}</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy>
</appender>
<!-- WARN 输入到文件，按日期和文件大小 -->
<appender name="WARN" class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder charset="utf-8">
<pattern>[%-5level] %d{${DATETIME}} [%thread] %logger{36} - %m%n
</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>WARN</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${ROOT}%d/warn.%i.log</fileNamePattern>
<maxHistory>${MAXHISTORY}</maxHistory>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>${FILESIZE}</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy>
</appender>
<!-- INFO 输入到文件，按日期和文件大小 -->
<appender name="INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder charset="utf-8">
<pattern>[%-5level] %d{${DATETIME}} [%thread] %logger{36} - %m%n
</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>INFO</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${ROOT}%d/info.%i.log</fileNamePattern>
<maxHistory>${MAXHISTORY}</maxHistory>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>${FILESIZE}</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy>
</appender>
<!-- DEBUG 输入到文件，按日期和文件大小 -->
<appender name="DEBUG" class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder charset="utf-8">
<pattern>[%-5level] %d{${DATETIME}} [%thread] %logger{36} - %m%n
</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>DEBUG</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${ROOT}%d/debug.%i.log</fileNamePattern>
<maxHistory>${MAXHISTORY}</maxHistory>
<timeBasedFileNamingAndTriggeringPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>${FILESIZE}</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy>
</appender>
<!-- TRACE 输入到文件，按日期和文件大小 -->
<appender name="TRACE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder charset="utf-8">
<pattern>[%-5level] %d{${DATETIME}} [%thread] %logger{36} - %m%n
</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>TRACE</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
<rollingPolicy
class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${ROOT}%d/trace.%i.log</fileNamePattern>
<maxHistory>${MAXHISTORY}</maxHistory>
<timeBasedFileNamingAndTriggeringPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>${FILESIZE}</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy>
</appender>
<!-- SQL相关日志输出-->
<logger name="org.mybatis.spring" level="DEBUG" additivity="true" />
<!-- Logger 根目录 -->
<root level="INFO">
<appender-ref ref="STDOUT" />
<appender-ref ref="DEBUG" />
<appender-ref ref="ERROR" />
<appender-ref ref="WARN" />
<appender-ref ref="INFO" />
<appender-ref ref="TRACE" />
</root>
</configuration>
\ No newline at end of file
com.zrqx.system/target/classes/runScript/start.bat deleted 100644 → 0
浏览文件 @ 05248bf9
@echo off
title %cd%
SET [jarName=[string]]
for %%i in (*.jar) do set jarName=%%i
echo %jarName%
java -Dfile.encoding=UTF-8 -Xmx512m -Xms256m -Xmn64m -Xss64m -jar -Dloader.path=lib %jarName%
\ No newline at end of file
com.zrqx.system/target/classes/runScript/start.sh deleted 100644 → 0
浏览文件 @ 05248bf9
#!/bin/sh
port=8604
jar='.jar'
for fileName in `ls`; do
if [[ $fileName == *$jar* ]]; then
echo $fileName
jarName=$fileName;
break
fi
done
#pid=$(ps -ef | grep $jarName | grep -v grep | awk '{print $2}');
pid=$(netstat -nlp | grep :$port | awk '{print $7}' | awk -F"/" '{print $1}');
echo "server process is $pid"
if [ -n '$pid' ]; then
echo "shut down server service process $pid "
kill -9 $pid;
echo "shut down server service process $pid success"
fi
echo "开始启动 ${jarName}..."
echo "java -jar -Xms50m -Xmx200m $jarName> log.log 2>&1 &"
nohup java -jar -Xms50m -Xmx200m $jarName> log.log 2>&1 &
echo "${jarName}启动成功！"
com.zrqx.system/target/classes/runScript/stop.bat deleted 100644 → 0
浏览文件 @ 05248bf9
@echo off
set port=8604
for /f "tokens=5" %%i in ('netstat -aon ^| findstr ":%port%"') do (
set n=%%i
)
taskkill /f /pid %n%
goto %a%
\ No newline at end of file
com.zrqx.system/target/classes/runScript/stop.sh deleted 100644 → 0
浏览文件 @ 05248bf9
#!/bin/sh
port=8604
jar='.jar'
for fileName in `ls`; do
if [[ $fileName == *$jar* ]]; then
echo $fileName
jarName=$fileName;
break
fi
done
#pid=$(ps -ef | grep $jarName | grep -v grep | awk '{print $2}');
pid=$(netstat -nlp | grep :$port | awk '{print $7}' | awk -F"/" '{print $1}');
echo "server process is $pid"
if [ -n '$pid' ]; then
echo "shut down server service process $pid "
kill -9 $pid;
echo "shut down server service process $pid success"
fi
echo "${jarName}关闭成功！"
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论