Skip to content

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

--no commit message

上级 6afc7f61
隐藏空白字符变更
内嵌 并排
正在显示 包含 301 行增加 和 5 行删除
com.zrqx.system/src/main/java/com/zrqx/system/fg/controller/question/FgExaminationController.java
浏览文件 @ 8e9f7d9f
......@@ -148,7 +148,8 @@ public class FgExaminationController {
@ApiOperation(value = "查看申请问卷数量" , notes = "查看申请问卷数量")
@GetMapping(value = SystemRequestPath.COUNT)
public CallBack<Integer> getNum(@ApiParam("主题id") @RequestParam String oid) {
Integer num=examinationService.examinationNum(oid);
LoginUserInfo userInfo = redis.getMember();
Integer num=examinationService.examinationNum(oid,userInfo.getUserId());
return CallBack.success(num);
}
......
com.zrqx.system/src/main/java/com/zrqx/system/fg/mapper/question/FgExaminationMapper.java
浏览文件 @ 8e9f7d9f
......@@ -42,6 +42,9 @@ public interface FgExaminationMapper extends BaseMapper<Examination> {
+ "<if test='"+ NOTBLANK +"(oid)'>"
+ " and singId = #{oid} "
+ "</if>"
+ "<if test='"+ NOTBLANK +"(userId)'>"
+ " and area_adminId = #{userId} "
+ "</if>"
+ "</script>")
Integer examinationNum(@Param("oid")String oid);
Integer examinationNum(@Param("oid")String oid,@Param("userId")String userId);
}
com.zrqx.system/src/main/java/com/zrqx/system/fg/service/question/FgExaminationService.java
浏览文件 @ 8e9f7d9f
......@@ -22,7 +22,7 @@ public interface FgExaminationService extends BaseService<Examination,String>{
FgExaminationListVo apply_List(FgUserQuestionForm form);
Integer examinationNum(String oid);
Integer examinationNum(String oid,String userId);
}
com.zrqx.system/src/main/java/com/zrqx/system/fg/service/question/FgExaminationServiceImpl.java
浏览文件 @ 8e9f7d9f
......@@ -199,9 +199,9 @@ public class FgExaminationServiceImpl extends BaseServiceImpl<Examination,String
}
@Override
public Integer examinationNum(String oid) {
public Integer examinationNum(String oid,String userId) {
// TODO Auto-generated method stub
return mapper.examinationNum(oid) ;
return mapper.examinationNum(oid,userId) ;
}
}
com.zrqx.system/target/classes/application.yml 0 → 100644
浏览文件 @ 8e9f7d9f
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 0 → 100644
浏览文件 @ 8e9f7d9f
<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 0 → 100644
浏览文件 @ 8e9f7d9f
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 0 → 100644
浏览文件 @ 8e9f7d9f
<?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/system/" />
<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 0 → 100644
浏览文件 @ 8e9f7d9f
@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 0 → 100644
浏览文件 @ 8e9f7d9f
#!/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 0 → 100644
浏览文件 @ 8e9f7d9f
@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 0 → 100644
浏览文件 @ 8e9f7d9f
#!/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 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论